git.osdn.net Git - android-x86/frameworks-base.git/log

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:36 +0000 (23:49 +0000)]

am e6f74816: (-s ours) am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit 'e6f7481631c1fd7a0d36d4515cf56f6c64e48267':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:29 +0000 (23:49 +0000)]

am f2cf3c19: (-s ours) am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'f2cf3c19e356ad34a181933742c64c842e431513':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:22 +0000 (23:49 +0000)]

am 7a7becd6: (-s ours) am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '7a7becd621cc3d4659e8e480fc7ebb5c1e4f0d6c':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:15 +0000 (23:49 +0000)]

am aae9a105: (-s ours) am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit 'aae9a105e9bf3a92033cc06481eb2fa40c6c6144':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:08 +0000 (23:49 +0000)]

am 755b7f3a: (-s ours) am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit '755b7f3a46b6d504760f4a422c92c731f3cdb1a2':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:59 +0000 (23:48 +0000)]

am 3ece6d8c: (-s ours) am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '3ece6d8c8830191586210d98169fbabc802d4e62':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:52 +0000 (23:48 +0000)]

am 4523c862: (-s ours) am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '4523c86247621d683d03ed70dedd68b000df3943':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:44 +0000 (23:48 +0000)]

am 6d738bb6: (-s ours) am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit '6d738bb6049d7ae5bf4b554796c93a8924ab545c':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:28 +0000 (23:48 +0000)]

am c32e8d4f: (-s ours) am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit 'c32e8d4f348042f4e431bc0bb4e635dca1886bf7':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:20 +0000 (23:48 +0000)]

am d2dd844b: (-s ours) am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit 'd2dd844bac3693daae223f51c5242e88e821de22':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:12 +0000 (23:48 +0000)]

am 9a0c696c: (-s ours) am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit '9a0c696c468fd4029d67af4cc9513045e07665da':

commit | commitdiff | tree

Jens Ole Lauridsen [Thu, 27 Aug 2015 23:48:04 +0000 (23:48 +0000)]

am e870314c: (-s ours) am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit 'e870314ce91a02c1c375881494605cbc14aa248d':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:50 +0000 (23:47 +0000)]

am aa5786e8: (-s ours) am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit 'aa5786e8aede3530ed22780461018c6f885d54af':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:41 +0000 (23:47 +0000)]

am 93db9633: (-s ours) am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '93db9633565331d91aac690382b432c9e689ad89':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:29 +0000 (23:47 +0000)]

am 6953cdae: (-s ours) am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit '6953cdaebad1fad6f25dd9357409d70310cfd116':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:21 +0000 (23:47 +0000)]

am 4ac79e44: (-s ours) am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

* commit '4ac79e44d35afbc5da451cfefb48da4c62a96bbf':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:09 +0000 (23:47 +0000)]

am 65f8923a: (-s ours) am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

* commit '65f8923a25b2ed40878f7d13708f2109c3c8eb2a':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:00 +0000 (23:47 +0000)]

am c8e51c1e: (-s ours) am 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

* commit 'c8e51c1e10c82d825b130441dceefbf749bb0a26':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:46:44 +0000 (23:46 +0000)]

am 1e4fbdf3: (-s ours) am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

* commit '1e4fbdf315eb546b4c112514e166c62ca017f279':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:46:36 +0000 (23:46 +0000)]

am b19e8427: (-s ours) am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

* commit 'b19e84277e54c989bb7cd8056ece33d3242ed4fa':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:46:19 +0000 (23:46 +0000)]

am 4db2aa3f: (-s ours) am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit '4db2aa3f469756cb59c5ff64bbd0a0862bdd45c4':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:46 +0000 (23:39 +0000)]

am 162a7997: (-s ours) am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit '162a799773594580a36773decd4fcb7c14f77dc7':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:39 +0000 (23:39 +0000)]

am 5ae9de3a: (-s ours) am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit '5ae9de3a241f7549c1ab8ea5e687c5b263aa0623':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:31 +0000 (23:39 +0000)]

am 330d6104: (-s ours) am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit '330d6104b7f0f74288e28f407a87afa6c468f2c9':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:23 +0000 (23:39 +0000)]

am 594f76d2: (-s ours) am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit '594f76d25b55efb8ebda690dbcb55ed70f064241':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:16 +0000 (23:39 +0000)]

am 14b65389: (-s ours) am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

* commit '14b65389a22162274dadc6febd523fafb19c0e99':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:08 +0000 (23:39 +0000)]

am 4efc4817: (-s ours) am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit '4efc48170ee1013303b92c0912cb35460167c057':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:38:59 +0000 (23:38 +0000)]

am 268a4616: (-s ours) am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit '268a461654b3f764aab75cc64ebbaaa7890ea8fd':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:38:51 +0000 (23:38 +0000)]

am a012a91b: (-s ours) am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit 'a012a91b9ddcc62d886799680c239bd4f9e63b15':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:38:43 +0000 (23:38 +0000)]

am 54dd25f0: (-s ours) am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

* commit '54dd25f09d08bf4edb785b78160d10fd570bfdaa':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:38:35 +0000 (23:38 +0000)]

am 4c276bb9: (-s ours) am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit '4c276bb904381f64edc79e365c0703a8265349b3':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:38:27 +0000 (23:38 +0000)]

am 4509e3d2: (-s ours) am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

* commit '4509e3d2e7741e33fc3fa1bb168ab7dfa95aba7a':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:38:16 +0000 (23:38 +0000)]

am 7781467d: (-s ours) am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit '7781467d481ea278f32ed5df5a4baddd0cc44550':

commit | commitdiff | tree

Tim Kilbourn [Thu, 27 Aug 2015 23:38:08 +0000 (23:38 +0000)]

am dbcad63b: am 8f1ea834: Handle the -a flag for dumpsys appops.

* commit 'dbcad63b43a249de44ac8f46e810e0c0fc66d7eb':

commit | commitdiff | tree

Ajay Panicker [Thu, 27 Aug 2015 19:56:20 +0000 (19:56 +0000)]

am 30aa53c7: am 92fb5342: am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

* commit '30aa53c7af22f98233a9c3acbe0efe20a569c8f1':
Add StateMachine.removeDeferredMessages()

commit | commitdiff | tree

Ajay Panicker [Thu, 27 Aug 2015 19:49:47 +0000 (19:49 +0000)]

am 92fb5342: am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

* commit '92fb534298dc2d7e91e6dc1a8d8454b7f3f173f8':
Add StateMachine.removeDeferredMessages()

commit | commitdiff | tree

Ajay Panicker [Thu, 27 Aug 2015 19:40:05 +0000 (19:40 +0000)]

am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

* commit 'c07701f2764a1c09dc3e8af4321ff0ef66056fee':
Add StateMachine.removeDeferredMessages()

commit | commitdiff | tree

Ajay Panicker [Thu, 27 Aug 2015 19:33:31 +0000 (19:33 +0000)]

am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

* commit '3e5b01185c08c46b80c395ca1f9c93e45cd98ba5':
Add StateMachine.removeDeferredMessages()

commit | commitdiff | tree

Eric Laurent [Thu, 27 Aug 2015 19:22:22 +0000 (19:22 +0000)]

am 155c1ad1: am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()

* commit '155c1ad113dd6ec6bab9fdcb0934db255603237a':
AudioTrack: error reporting for getTimestamp()

commit | commitdiff | tree

Ajay Panicker [Thu, 27 Aug 2015 19:21:39 +0000 (19:21 +0000)]

Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

commit | commitdiff | tree

Eric Laurent [Thu, 27 Aug 2015 18:42:35 +0000 (18:42 +0000)]

am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()

* commit '38f6f487b2a8de7ebd7c07b216588dcbb53887ae':
AudioTrack: error reporting for getTimestamp()

commit | commitdiff | tree

Eric Laurent [Thu, 27 Aug 2015 18:33:41 +0000 (18:33 +0000)]

am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()

* commit 'aef51d09ef33eb3f03789c71edc25a7b103728d1':
AudioTrack: error reporting for getTimestamp()

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:31:31 +0000 (18:31 +0000)]

am c63a12b7: am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

* commit 'c63a12b78c364a17399ce99f7f74fab8b4b03b38':
Prevent Fingerprint when SIM is locked

commit | commitdiff | tree

Eric Laurent [Thu, 27 Aug 2015 18:28:48 +0000 (18:28 +0000)]

am 4a8034ca: AudioTrack: error reporting for getTimestamp()

* commit '4a8034caea13a90c01800ff554539772c6ff5523':
AudioTrack: error reporting for getTimestamp()

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:24:03 +0000 (18:24 +0000)]

am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

* commit '6fe373b10ef2a2e56745ee2c67588e96f5b8dcad':
Prevent Fingerprint when SIM is locked

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:15:21 +0000 (18:15 +0000)]

am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

* commit '16d7245b64062f4c65d55433642388d1dc9bdf70':
Prevent Fingerprint when SIM is locked

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:06:44 +0000 (18:06 +0000)]

Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

commit | commitdiff | tree

Eric Laurent [Thu, 2 Jul 2015 19:09:44 +0000 (12:09 -0700)]

AudioTrack: error reporting for getTimestamp()

Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
(cherry picked from commit 4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 10:45:05 +0000 (10:45 +0000)]

am 3b83e5bf: (-s ours) am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev

* commit '3b83e5bf7bea56966860682baa8d7a9894ae78d4':

commit | commitdiff | tree

Chien-Yu Chen [Thu, 27 Aug 2015 10:44:57 +0000 (10:44 +0000)]

am 44674d69: (-s ours) am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev

* commit '44674d69ebb5aa58c82f59e9f620008cb7f13083':

commit | commitdiff | tree

Nicholas Sauer [Thu, 27 Aug 2015 10:44:48 +0000 (10:44 +0000)]

am 028ef11a: (-s ours) am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev

* commit '028ef11abbc32417b86165fe58ea8ce35f192f8a':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 10:44:41 +0000 (10:44 +0000)]

am 332bdb16: (-s ours) am 8b73003f: am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"

* commit '332bdb16277c5bc65e75274e18ee2656283f0a27':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 10:44:33 +0000 (10:44 +0000)]

am 635c9915: (-s ours) am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev

* commit '635c9915e64c69bdf9b5d1a9923b7085d146ba64':

commit | commitdiff | tree

Chris Tate [Thu, 27 Aug 2015 10:44:25 +0000 (10:44 +0000)]

am 555f91db: (-s ours) am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev

* commit '555f91db7cb364714b1f731a85242adc98b868c3':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 10:44:17 +0000 (10:44 +0000)]

am 98efab2d: (-s ours) am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev

* commit '98efab2d28a08f56c4ab04a3bce14a21cd13ad44':

commit | commitdiff | tree

Nicolas Prevot [Thu, 27 Aug 2015 10:44:10 +0000 (10:44 +0000)]

am cd5c678d: (-s ours) am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.

* commit 'cd5c678d2021b54d12082d1c59faafa1b8660941':

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 27 Aug 2015 10:44:02 +0000 (10:44 +0000)]

am d14e1f2f: (-s ours) am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev

* commit 'd14e1f2fbdc9c6e85a9581b5a496bd514c2511f9':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 10:43:54 +0000 (10:43 +0000)]

am 4b93324d: (-s ours) am def6896d: Fix shifted wallpaper after OTA

* commit '4b93324d17743c15a69c62fc08cbb5812ddf8b44':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:43:45 +0000 (10:43 +0000)]

am 76d4d5d1: (-s ours) am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev

* commit '76d4d5d19dc4548c90d73fd74174bf4e21674011':

commit | commitdiff | tree

Scott Main [Thu, 27 Aug 2015 10:43:36 +0000 (10:43 +0000)]

am 1112cbe6: (-s ours) am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev

* commit '1112cbe67dddd719422c32fa9129118e70aa5637':

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 27 Aug 2015 10:43:25 +0000 (10:43 +0000)]

am d803ef13: (-s ours) am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev

* commit 'd803ef138df1172edfde527129957b00a8616dbe':

commit | commitdiff | tree

Andrew Solovay [Thu, 27 Aug 2015 10:43:16 +0000 (10:43 +0000)]

am ebd845bf: (-s ours) am 9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev

* commit 'ebd845bf06417155f541205e50474ac467419e80':

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 27 Aug 2015 10:43:03 +0000 (10:43 +0000)]

am a52995cc: (-s ours) am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev

* commit 'a52995cc902f1a3670b23188a511433ade84a601':

commit | commitdiff | tree

Glenn Kasten [Thu, 27 Aug 2015 10:42:55 +0000 (10:42 +0000)]

am b2c6413c: (-s ours) am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev

* commit 'b2c6413c7064f71290c60313de3d931ef60c7fe6':

commit | commitdiff | tree

Cheryl Potter [Thu, 27 Aug 2015 10:42:45 +0000 (10:42 +0000)]

am f152540a: (-s ours) am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs

* commit 'f152540a7e4a085c55d6a7c65d5e445557146ba9':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 10:42:36 +0000 (10:42 +0000)]

am 950297d2: (-s ours) am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev

* commit '950297d27fcabe22b7c9fbbfa28ef8b9a350ae37':

commit | commitdiff | tree

Stephen Hines [Thu, 27 Aug 2015 10:42:27 +0000 (10:42 +0000)]

am c5aa1bc9: (-s ours) resolved conflicts for merge of da1173f4 to mnc-dev-plus-aosp

* commit 'c5aa1bc948384a1d17463005dd3c0119a10ea036':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 10:42:19 +0000 (10:42 +0000)]

am d8f61f20: (-s ours) am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev

* commit 'd8f61f201dfc0fe669d45ee2f0d540de3771b984':

commit | commitdiff | tree

Tom Cherry [Thu, 27 Aug 2015 10:42:11 +0000 (10:42 +0000)]

am 9f5e9ec7: (-s ours) am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service"

* commit '9f5e9ec76ab7c0698469ec75785294aa94480f57':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 10:42:03 +0000 (10:42 +0000)]

am 04a1cac9: (-s ours) am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev

* commit '04a1cac9374326b320e8cecaae3a1156662901b7':

commit | commitdiff | tree

Sebastien Hertz [Thu, 27 Aug 2015 10:41:55 +0000 (10:41 +0000)]

am fcb005d1: (-s ours) am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit 'fcb005d1c8b8aea6581eb40cb34b6016a4389968':

commit | commitdiff | tree

Sebastien Hertz [Thu, 27 Aug 2015 10:41:47 +0000 (10:41 +0000)]

am d5241d83: (-s ours) am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

* commit 'd5241d83fe357bb6bdeb61a507ef8e0af2949949':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 10:41:38 +0000 (10:41 +0000)]

am 1ae064d6: (-s ours) am ddc2536d: Make sure to kill restore-at-install full-data targets after restore

* commit '1ae064d6c2c33ed50a70982952a2034999c018e3':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 10:41:30 +0000 (10:41 +0000)]

am 0f84781b: (-s ours) am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev

* commit '0f84781bbab1c2f2d982b962507898f8351ed6fd':

commit | commitdiff | tree

Chong Zhang [Thu, 27 Aug 2015 10:41:21 +0000 (10:41 +0000)]

am 9f38dd3d: (-s ours) am 7efe9f67: am 5923d161: Merge "wm: call displayReady for all built in displays when system is ready."

* commit '9f38dd3d394e447f7c5d78de714f3eab946dfb77':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 10:41:13 +0000 (10:41 +0000)]

am 8a363bb1: (-s ours) am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev

* commit '8a363bb13de1fb0600a69352a0fb4a844fba21e2':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 10:41:05 +0000 (10:41 +0000)]

am 1262059c: (-s ours) am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process"

* commit '1262059c072375cd5bd48e86b7ee69d66848494d':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:40:55 +0000 (10:40 +0000)]

am 5bc17ad2: (-s ours) am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)

* commit '5bc17ad258d65c87826ed3c9503b627b03f372b4':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:40:48 +0000 (10:40 +0000)]

am 0171f382: (-s ours) am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

* commit '0171f3829cf8b9257a77fca49b8326287c76b286':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 10:40:40 +0000 (10:40 +0000)]

am 746aee22: (-s ours) am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev

* commit '746aee22e872581607fc1bc9a6425ba924e73393':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:40:31 +0000 (10:40 +0000)]

am 8e79119c: (-s ours) am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs

* commit '8e79119ca2703b6ffd780a5314a4b6baf19908d8':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:40:22 +0000 (10:40 +0000)]

am afee154d: (-s ours) am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs

* commit 'afee154dd7dd90088e89d444301108cca0854bc6':

commit | commitdiff | tree

Tyler Gunn [Thu, 27 Aug 2015 10:40:14 +0000 (10:40 +0000)]

am 4f03dfe7: (-s ours) am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check.

* commit '4f03dfe78e9d2f925fabc10c640944e0f2a9c7d4':

commit | commitdiff | tree

Lorenzo Colitti [Thu, 27 Aug 2015 10:40:05 +0000 (10:40 +0000)]

am c4b6cee6: (-s ours) am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev

* commit 'c4b6cee6c81975ca31a45aaa35901d6ed8a2d9e1':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 10:39:57 +0000 (10:39 +0000)]

am 8f3ef070: (-s ours) am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev

* commit '8f3ef0700b1aa2acdf23fea024bf0aacf5953844':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:39:49 +0000 (10:39 +0000)]

am 4519b64f: (-s ours) am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev

* commit '4519b64fdad7bc6b09befbf3ff22245c6bdb8c5f':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 10:39:41 +0000 (10:39 +0000)]

am c301ab8d: (-s ours) Move aapt2 off HAVE_MS_C_RUNTIME.

* commit 'c301ab8d6ab553ee0e641558f9fbe2f974a70e52':
Move aapt2 off HAVE_MS_C_RUNTIME.

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 10:39:33 +0000 (10:39 +0000)]

am 127a0d16: (-s ours) am 8b8fa3e9: Fix SysUI crash when no metadata is provided

* commit '127a0d16f464ba3a1af12a72c72e875a605b763e':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 10:39:26 +0000 (10:39 +0000)]

am 265b194f: (-s ours) am f610bd78: Fix race conditions for camera prewarm service

* commit '265b194fac5b300461a6c70ada18d5a3d898adec':

commit | commitdiff | tree

Chris Craik [Thu, 27 Aug 2015 10:39:18 +0000 (10:39 +0000)]

am fc7f6197: (-s ours) am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev

* commit 'fc7f6197cb7df0d293ba18e7eca3849c5f4d3376':

commit | commitdiff | tree

Tenghui Zhu [Thu, 27 Aug 2015 10:39:09 +0000 (10:39 +0000)]

am 605f4b88: (-s ours) am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev

* commit '605f4b8881a905aeca04d90e8b8d3c1f40430e2f':

commit | commitdiff | tree

Quddus Chong [Thu, 27 Aug 2015 10:39:02 +0000 (10:39 +0000)]

am 35796dc7: (-s ours) am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev

* commit '35796dc7a8bca07b2dc8c61b9e07f1c5cb8ad855':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 10:38:54 +0000 (10:38 +0000)]

am 750598f8: (-s ours) am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit '750598f89e1a313c2bbea6ee4c87780891e0108a':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 10:38:47 +0000 (10:38 +0000)]

am af22fa7b: (-s ours) am 448216e7: Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev

* commit 'af22fa7be8883f9780a2d18283ab9f859b4a2c55':

commit | commitdiff | tree

Roozbeh Pournader [Thu, 27 Aug 2015 10:38:38 +0000 (10:38 +0000)]

am a0a6d2c5: (-s ours) am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit 'a0a6d2c5d6e4214f407911667ad2b6004fcfe2c7':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:38:30 +0000 (10:38 +0000)]

am c8869f93: (-s ours) am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit 'c8869f93928277e4a5e8867c955b733f9c241723':

commit | commitdiff | tree

Tao Bao [Thu, 27 Aug 2015 10:38:18 +0000 (10:38 +0000)]

am 9d995335: (-s ours) am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."

* commit '9d995335f0c8d5090ba6c774853fe261037177eb':

commit | commitdiff | tree

Sebastien Hertz [Thu, 27 Aug 2015 10:38:08 +0000 (10:38 +0000)]

am e9538685: (-s ours) am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit 'e95386852e70995e3356177c7e0d507fd1d01b65':

commit | commitdiff | tree

Joe Fernandez [Thu, 27 Aug 2015 10:37:59 +0000 (10:37 +0000)]

am cfdc3640: (-s ours) am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit 'cfdc3640c214450007772262142bef35654b0a44':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 10:37:49 +0000 (10:37 +0000)]

am 82a1f1bc: (-s ours) am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit '82a1f1bc9464b985a9cf89338ebfef882602b7b3':