am aa3770fb: am e8c9ce73: am 5e42147a: (-s ours) am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.

* commit 'aa3770fbaeef3b54dc6946e65ed89b53b47e5c94':
am d5bef5dd: am 4e2e6dfd: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface

* commit 'd5bef5ddcbd42e7cacf6cd169e37738dae1478ac':
am 3be4c86c: am d76ba621: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev

* commit '3be4c86c510e5c9c32f3f32f46be5db50165bd09':
am e7564bd6: am e114fcc7: am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev

* commit 'e7564bd64dfa7208365fa4977b250cd8930818ed':
am f1aabd93: am d895caf7: am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev

* commit 'f1aabd93c2ed94c7fde77f0ba2444d2c4dfa01f2':
am 2d9f13cf: am b05e449b: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev

* commit '2d9f13cfb5b4c803a08b5d324fad99fb5adf59d8':
am 748ab7f2: am 34130c86: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev

* commit '748ab7f2fbc947156e08f774a403b422ddf6762f':
am 0b025ca7: am 78c66c99: am 07f85fec: Merge "Fix bug #7374285  GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev

* commit '0b025ca7929c71786833d34141be7725db59d44f':
am fcfc549e: am ac7806b9: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev

* commit 'fcfc549e01b432e1e7d9187c38f4a9e08a0f940e':
am 57cfcfc8: am 7fb1aac6: am 0437302f: Merge "Fix the build" into jb-mr1-dev

* commit '57cfcfc8abad428171b341c0680b977a311409b8':
am cd94777f: am afb856f2: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev

* commit 'cd94777f4600d395890767531e40ead0a9b041c0':
am 3a4fa221: am 8855ba62: am ed5387be: (-s ours) am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.

* commit '3a4fa2212fe4eada7bc9b936d1994643a67eee19':
am 13d46256: am 2a808f97: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev

* commit '13d462564b0267f4736b2b1fdf01f782f4ebe9a1':
am bd255459: am c6275f58: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev

* commit 'bd25545961ea7ac14b92bbf5fe151b09c2e7e12f':
am e2243c89: am 9254d310: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev

* commit 'e2243c89cdaaaade144448a03da336b120aeb0e4':
am bdf4c8ce: am c4070bbd: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev

* commit 'bdf4c8ce5a2011f3a1ab6c0bf8037a8b60d26834':
am 76c9f3e0: am b81cedad: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev

* commit '76c9f3e0c61c39f44421546b24e6b6bfd5cd48ad':
am 54c7f0b2: am 2275482b: am 80343f64: Fix recents animations for secondary users

* commit '54c7f0b21bffdcb2a0e3b6017ffcda005dac3495':
am d3352bc9: am 54030065: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev

* commit 'd3352bc9eb44782fbfd807dc6ae3ac434a4c03cd':
am 7613563c: am 561253f0: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev

* commit '7613563c0caa812aed6213b225754db80e5b9b11':