frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	am 44b3a009: am e681aed1: am f92a1fdb: Fixed a bug where notifications ↵	Selim Cinek	2015-08-01	2	-2/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	shadows were blinking out * commit '44b3a009479f7987fe3d781ac6fa7a47db210888': Fixed a bug where notifications shadows were blinking out
\| *	am e681aed1: am f92a1fdb: Fixed a bug where notifications shadows were ↵	Selim Cinek	2015-08-01	2	-2/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blinking out * commit 'e681aed17f346e0c7d22bdd177828419e02ec6ec': Fixed a bug where notifications shadows were blinking out
\| \| *	am f92a1fdb: Fixed a bug where notifications shadows were blinking out	Selim Cinek	2015-07-31	2	-2/+8
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'f92a1fdb77311149189ae17244adc51017b89c1e': Fixed a bug where notifications shadows were blinking out
\| \| \| *	Fixed a bug where notifications shadows were blinking out	Selim Cinek	2015-07-31	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 22567770 Change-Id: I2d335241a287d0c64e659221994f19b7c13eccd3
* \| \| \|	am 6e7b9135: am 3249330c: am 00ab3578: Merge "Make enter reveal animation be ↵	Filip Gruszczynski	2015-08-01	1	-0/+1
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	zorder top." into mnc-dev * commit '6e7b9135cc47181065ca6a7464cb7fc183083240': Make enter reveal animation be zorder top.
\| * \| \|	am 3249330c: am 00ab3578: Merge "Make enter reveal animation be zorder top." ↵	Filip Gruszczynski	2015-08-01	1	-0/+1
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mnc-dev * commit '3249330c593442d9a2b45f5e4598451d71b7ebd3': Make enter reveal animation be zorder top.
\| \| * \|	am 00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev	Filip Gruszczynski	2015-07-31	1	-0/+1
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '00ab35783c3909c783effbf28da6dda2bf67c1a8': Make enter reveal animation be zorder top.
\| \| \| *	Merge "Make enter reveal animation be zorder top." into mnc-dev	Filip Gruszczynski	2015-07-31	1	-0/+1
\| \| \| \|\
\| \| \| \| *	Make enter reveal animation be zorder top.	Filip Gruszczynski	2015-07-31	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the bug where launcher icons become temporarily visible when home button is pressed while other activity is starting. By having the starting activity's animation be zoder top, it will continue to be drawn on top of the launcher until it animates away. Bug: 22809202 Change-Id: If5e3c09b7a5df4537c355f94e986766f77ad4943
* \| \| \| \|	am cba2c596: am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add ↵	Dianne Hackborn	2015-08-01	6	-6/+38
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev * commit 'cba2c59612fc608c6f0e9c3823cac1435a2d29d8': Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
\| * \| \| \|	am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked ↵	Dianne Hackborn	2015-08-01	6	-6/+38
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to assist.ViewNode.NodeProperties" into mnc-dev * commit '6aa0843ed95d3af828c8dc415053b91f3db25fac': Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
\| \| * \| \|	am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to ↵	Dianne Hackborn	2015-07-31	6	-6/+38
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	assist.ViewNode.NodeProperties" into mnc-dev * commit 'fb68b0ad344edbba15b961dc444cb24dcfc29995': Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
\| \| \| * \|	Merge "Fix issue #21895842: Add is_assist_blocked to ↵	Dianne Hackborn	2015-07-31	6	-6/+38
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	assist.ViewNode.NodeProperties" into mnc-dev
\| \| \| \| * \|	Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties	Dianne Hackborn	2015-07-31	6	-6/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I928882d42d0546cc6a12e803d96131beaba76d4e
* \| \| \| \| \|	am 4bdc3179: am de680550: am ffbdb8ad: Merge "Fix that shutter sound does ↵	Jean-Michel Trivi	2015-08-01	1	-1/+5
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not play after ringer mode changes to vibrator" into mnc-dev * commit '4bdc317923d205045921c37b4d6cfe2bd406b856': Fix that shutter sound does not play after ringer mode changes to vibrator
\| * \| \| \| \|	am de680550: am ffbdb8ad: Merge "Fix that shutter sound does not play after ↵	Jean-Michel Trivi	2015-08-01	1	-1/+5
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ringer mode changes to vibrator" into mnc-dev * commit 'de680550e4e77627f01ae4dff7b3fb8c6e08bd18': Fix that shutter sound does not play after ringer mode changes to vibrator
\| \| * \| \| \|	am ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode ↵	Jean-Michel Trivi	2015-07-31	1	-1/+5
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changes to vibrator" into mnc-dev * commit 'ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75': Fix that shutter sound does not play after ringer mode changes to vibrator
\| \| \| * \| \|	Merge "Fix that shutter sound does not play after ringer mode changes to ↵	Jean-Michel Trivi	2015-07-31	1	-1/+5
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	vibrator" into mnc-dev
\| \| \| \| * \| \|	Fix that shutter sound does not play after ringer mode changes to vibrator	Sungmin Choi	2015-07-31	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reproduce sequence: 1. Change ring volume to vibration in Settings > Sound & notification > Ring volume using touch 2. Launch camera app 3. Capture, but cannot hear shutter sound 4. Even change ringtone to maximum, shutter sound is not played before reboot Bug: 22589664 Change-Id: I90eb044eaf21f3b558bf050bf1d9f0b33ea4888b
* \| \| \| \| \| \|	am 4cf97c91: am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to ↵	Alan Viverette	2015-08-01	1	-52/+81
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LinearLayout measurement" into mnc-dev * commit '4cf97c915a3a1bb88fec3a99beee5675ae35acfe': Revert two changes to LinearLayout measurement
\| * \| \| \| \| \|	am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout ↵	Alan Viverette	2015-08-01	1	-52/+81
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	measurement" into mnc-dev * commit '7bfe7b5b541e3b4585c3ef7eb6d4fb3bd9218df0': Revert two changes to LinearLayout measurement
\| \| * \| \| \| \|	am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev	Alan Viverette	2015-07-31	1	-52/+81
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '5cca30a4ee28a5e70531508d9ad607107adfaa86': Revert two changes to LinearLayout measurement
\| \| \| * \| \| \|	Merge "Revert two changes to LinearLayout measurement" into mnc-dev	Alan Viverette	2015-07-31	1	-52/+81
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Revert two changes to LinearLayout measurement	Alan Viverette	2015-07-31	1	-52/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"Include non-zero dimension views in excess space calculation" and "Always distribute excess space in LinearLayout measurement" changed LinearLayout behavior significantly in a way that wasn't covered by CTS tests. This reverts commits da2f3044092318d44173bdb9918f31c592b86a73 and 4fabc021583cfd5cc551eda7d7b9809683a6ca9a. Bug: 22862047 Change-Id: I8d37a525ccf295445d3239b80e5cacb10bf3c947
* \| \| \| \| \| \| \|	am 6550e461: am 0568a230: am 9d8a230f: Revert "View measurement optimization"	Alan Viverette	2015-08-01	1	-10/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '6550e461e50626b88835576e7bf12f49bb322e73': Revert "View measurement optimization"
\| * \| \| \| \| \| \|	am 0568a230: am 9d8a230f: Revert "View measurement optimization"	Alan Viverette	2015-08-01	1	-10/+5
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '0568a230b34f879215e65fbaa79dfa377085bb41': Revert "View measurement optimization"
\| \| * \| \| \| \| \|	am 9d8a230f: Revert "View measurement optimization"	Alan Viverette	2015-07-31	1	-10/+5
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '9d8a230fbd71ac57ef806326f15fa133ba125083': Revert "View measurement optimization"
\| \| \| * \| \| \| \|	Revert "View measurement optimization"	Alan Viverette	2015-07-31	1	-10/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LinearLayout relied on multiple measurement passes to hide a discrepancy between EXACTLY and non-EXACTLY measurements. This reverts commit 9cefbda11ee5308145d58b0b99ced0f66a0b1cf9. Bug: 22810327 Change-Id: I515a80749420d00efc5002fa68221b7c236f03df
* \| \| \| \| \| \| \|	am ac3a70db: am c8222f40: am c35e670d: Moving removeTask to separate thread.	Winson Chung	2015-08-01	1	-23/+21
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ac3a70dbaee91f7ac1f15162bcc815749102f029': Moving removeTask to separate thread.
\| * \| \| \| \| \| \|	am c8222f40: am c35e670d: Moving removeTask to separate thread.	Winson Chung	2015-08-01	1	-23/+21
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c8222f40fcea5912d7154858bf6de5fa95083e40': Moving removeTask to separate thread.
\| \| * \| \| \| \| \|	am c35e670d: Moving removeTask to separate thread.	Winson Chung	2015-07-31	1	-23/+21
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c35e670d5386eb6388eb4e65746b950265312e7a': Moving removeTask to separate thread.
\| \| \| * \| \| \| \|	Moving removeTask to separate thread.	Winson Chung	2015-07-31	1	-23/+21
\| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 22760556 Change-Id: Iac6eef77e3ba5432ac1cd4aa792e7b2aadc27c01
* \| \| \| \| \| \|	am afa039c9: am 183b589f: am 92e0c86f: Merge "Ensuring that we don\'t try to ↵	Winson Chung	2015-08-01	2	-3/+14
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use and propagate null activity labels." into mnc-dev * commit 'afa039c96c2587095c588145fbbb2237be51f9bc': Ensuring that we don't try to use and propagate null activity labels.
\| * \| \| \| \| \|	am 183b589f: am 92e0c86f: Merge "Ensuring that we don\'t try to use and ↵	Winson Chung	2015-08-01	2	-3/+14
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	propagate null activity labels." into mnc-dev * commit '183b589fd4e3381a5f64f2782f3fffad9dd25b0e': Ensuring that we don't try to use and propagate null activity labels.
\| \| * \| \| \| \|	am 92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null ↵	Winson Chung	2015-07-31	2	-3/+14
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	activity labels." into mnc-dev * commit '92e0c86fa2b84619ebc3acb6d91434dd17113c61': Ensuring that we don't try to use and propagate null activity labels.
\| \| \| * \| \| \|	Merge "Ensuring that we don't try to use and propagate null activity ↵	Winson Chung	2015-07-31	2	-3/+14
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	labels." into mnc-dev
\| \| \| \| * \| \| \|	Ensuring that we don't try to use and propagate null activity labels.	Winson Chung	2015-07-31	2	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also fixes issue with tapping outside bounds not working to dismiss recents Bug: 21774486 Bug: 22241587 Change-Id: Ib50f6fece8fb150929a1f8cdb01b8e8fe7b665cd
* \| \| \| \| \| \| \|	am 92a59d8e: am 92385030: am e836a229: Fix build.	Deepanshu Gupta	2015-08-01	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '92a59d8ea879970871392c5b2eb24810e7af9b51': Fix build.
\| * \| \| \| \| \| \|	am 92385030: am e836a229: Fix build.	Deepanshu Gupta	2015-08-01	1	-3/+3
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '923850304a00d337e8bd76000c8ff480df25e7e2': Fix build.
\| \| * \| \| \| \| \|	am e836a229: Fix build.	Deepanshu Gupta	2015-07-31	1	-3/+3
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e836a229aefb0ff3b82e19a422590fb7c4bd5148': Fix build.
\| \| \| * \| \| \| \|	Fix build.	Deepanshu Gupta	2015-07-31	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I82295b758e5ceb42e260d3c36ea2310a9def5190
* \| \| \| \| \| \| \|	am 0e0be5c7: am 88cf6d62: am f7e00dbd: Merge "Fixed issue with artifacts ↵	Wale Ogunwale	2015-08-01	1	-3/+12
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	during scale-up transition animation" into mnc-dev * commit '0e0be5c7882779579c35901989ae592d7892386b': Fixed issue with artifacts during scale-up transition animation
\| * \| \| \| \| \| \|	am 88cf6d62: am f7e00dbd: Merge "Fixed issue with artifacts during scale-up ↵	Wale Ogunwale	2015-08-01	1	-3/+12
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	transition animation" into mnc-dev * commit '88cf6d625cff9e19f5ec95dd9ee9599a6ffe1501': Fixed issue with artifacts during scale-up transition animation
\| \| * \| \| \| \| \|	am f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition ↵	Wale Ogunwale	2015-07-31	1	-3/+12
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	animation" into mnc-dev * commit 'f7e00dbd08038d52c1158eea61e253ff8155569b': Fixed issue with artifacts during scale-up transition animation
\| \| \| * \| \| \| \|	Merge "Fixed issue with artifacts during scale-up transition animation" into ↵	Wale Ogunwale	2015-07-31	1	-3/+12
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mnc-dev
\| \| \| \| * \| \| \| \|	Fixed issue with artifacts during scale-up transition animation	Wale Ogunwale	2015-07-30	1	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is possible to get some artifacts during scale-up transition animation of some fullscreen activities like Chrome. This is caused by the clip rect specified by the transformation extending outside the sys decor rect. We now contain the clip rect within the system decor rect. Also note that we don't want to do this for none-fullscreen activities as it might cause some premature clipping. Bug: 22830775 Bug: 21727851 Bug: 20652683 Bug: 19523205 Bug: 15046646 https://code.google.com/p/android/issues/detail?id=161362 Change-Id: I33827caaa256ad8fdc0eb3650ef34e95c48a6988
* \| \| \| \| \| \| \| \|	am e7b37bc2: am 5c8072df: am ebbc891a: Merge "Fix build." into mnc-dev	Dianne Hackborn	2015-08-01	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e7b37bc20ec4ddb775b2af243a859e59da877423': Fix build.
\| * \| \| \| \| \| \| \|	am 5c8072df: am ebbc891a: Merge "Fix build." into mnc-dev	Dianne Hackborn	2015-08-01	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '5c8072df22bf9febcf2e8e08bf440341bf789991': Fix build.
\| \| * \| \| \| \| \| \|	am ebbc891a: Merge "Fix build." into mnc-dev	Dianne Hackborn	2015-07-31	1	-2/+2
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ebbc891ae4ca835dea278430e3bad42d4630e2af': Fix build.
\| \| \| * \| \| \| \| \|	Merge "Fix build." into mnc-dev	Dianne Hackborn	2015-07-31	1	-2/+2
\| \| \| \|\ \ \ \ \ \