OSDN Git Service
Svetoslav [Mon, 1 Jun 2015 23:56:49 +0000 (23:56 +0000)]
am
acbe426b: Merge "Add accidentally deleted strings." into mnc-dev
* commit '
acbe426bbc126575e588d3cbd6bd09ee194e6dd0':
Add accidentally deleted strings.
Selim Gurun [Mon, 1 Jun 2015 23:56:45 +0000 (23:56 +0000)]
am
8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev
* commit '
8a6d511dad3bb38f8cd1ec4557927bc6f307d4ed':
Remove ViewAssistStructure and use the frameworks data structure
Alan Viverette [Mon, 1 Jun 2015 23:56:40 +0000 (23:56 +0000)]
am
b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev
* commit '
b0f94ae5d2eec2bb4a0bd1b60eb3db75417c1f8f':
Always send VIEW_CLICKED event from AdapterView.performItemClick()
Eino-Ville Talvala [Mon, 1 Jun 2015 23:56:34 +0000 (23:56 +0000)]
am
717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
* commit '
717a2d09fa2bb8ffb89e9e602ae97056736da4b0':
Camera2: Remove isLoggable
Svetoslav [Mon, 1 Jun 2015 23:53:54 +0000 (23:53 +0000)]
Merge "Add accidentally deleted strings." into mnc-dev
Selim Gurun [Mon, 1 Jun 2015 23:53:06 +0000 (23:53 +0000)]
Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 23:52:35 +0000 (23:52 +0000)]
Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev
Svetoslav [Mon, 1 Jun 2015 23:51:11 +0000 (16:51 -0700)]
Add accidentally deleted strings.
Change-Id: I16d7c151b46c076bfdccb1ff0b2bcb0934eedf93
Eino-Ville Talvala [Mon, 1 Jun 2015 23:47:31 +0000 (23:47 +0000)]
Merge "Camera2: Remove isLoggable" into mnc-dev
Jeff Brown [Mon, 1 Jun 2015 23:43:24 +0000 (23:43 +0000)]
am
0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev
* commit '
0505f7f2b5a2e45884a97eeb75c35086a7560c69':
Terminate loop properly when cursor window is full.
Alan Viverette [Mon, 1 Jun 2015 23:41:42 +0000 (16:41 -0700)]
Always send VIEW_CLICKED event from AdapterView.performItemClick()
This makes it consistent with View.performClick().
Bug:
19574976
Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d
Selim Gurun [Mon, 1 Jun 2015 23:26:10 +0000 (16:26 -0700)]
Remove ViewAssistStructure and use the frameworks data structure
As part of the API rename from ViewAssistStructure to ViewStructure,
we added a temporary workaround to prevent build breakage. Remove
the temporary workaround since the current unbundled webview package
implements the updated onProvideVirtualStructure API.
Change-Id: I13a5b8dee3e856eb585de53a0750bd52c7a909a7
Jeff Brown [Mon, 1 Jun 2015 23:34:24 +0000 (23:34 +0000)]
Merge "Terminate loop properly when cursor window is full." into mnc-dev
Jeff Brown [Sat, 30 May 2015 01:48:38 +0000 (18:48 -0700)]
Terminate loop properly when cursor window is full.
The existing code exits the column-filling loop immediately but
may continue to try to fill rows. Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later. Fixed this problem by exiting the row-
filling loop promptly.
Bug:
21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
Adrian Roos [Mon, 1 Jun 2015 23:28:58 +0000 (23:28 +0000)]
am
c45d6c30: Merge "Translucent bars in landscape" into mnc-dev
* commit '
c45d6c30a58062af05d8232fd0f020e3f854bb8a':
Translucent bars in landscape
Deepanshu Gupta [Mon, 1 Jun 2015 23:28:53 +0000 (23:28 +0000)]
am
346222f9: Merge "LayoutLib: Skip classes from java package." into mnc-dev
* commit '
346222f90a723787e2625329a75ec0dfc35a3f4d':
LayoutLib: Skip classes from java package.
Deepanshu Gupta [Mon, 1 Jun 2015 23:28:48 +0000 (23:28 +0000)]
am
7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev
* commit '
7ef93d157344b07e17715b0fa6e69a4d97154dfa':
Skip warnings for some unresolved references.
Adrian Roos [Mon, 1 Jun 2015 23:25:33 +0000 (23:25 +0000)]
Merge "Translucent bars in landscape" into mnc-dev
Quddus Chong [Mon, 1 Jun 2015 23:21:40 +0000 (23:21 +0000)]
am
133b107d: am
65b7485d: am
2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
* commit '
133b107d28649ef5a984be0acc06f53e49853b22':
docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
Winson Chung [Mon, 1 Jun 2015 23:21:35 +0000 (23:21 +0000)]
am
c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev
* commit '
c85cd734bdf75a55608fae1d5a47b4ac72db4ee8':
Don't focus view for invalid task index.
Deepanshu Gupta [Mon, 1 Jun 2015 23:20:11 +0000 (23:20 +0000)]
Merge "LayoutLib: Skip classes from java package." into mnc-dev
Deepanshu Gupta [Mon, 1 Jun 2015 23:20:03 +0000 (23:20 +0000)]
Merge "Skip warnings for some unresolved references." into mnc-dev
Quddus Chong [Mon, 1 Jun 2015 23:11:47 +0000 (23:11 +0000)]
am
65b7485d: am
2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
* commit '
65b7485d64661394b61df3df7eeccd063932886e':
docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
Winson Chung [Mon, 1 Jun 2015 23:07:36 +0000 (23:07 +0000)]
Merge "Don't focus view for invalid task index." into mnc-dev
Winson Chung [Mon, 1 Jun 2015 23:02:58 +0000 (16:02 -0700)]
Don't focus view for invalid task index.
Bug:
21322861
Change-Id: I7b8397d18b488bd8f459e578b64d6e82e4f1437d
Adrian Roos [Wed, 27 May 2015 01:30:37 +0000 (18:30 -0700)]
Translucent bars in landscape
Bug:
18739556
Change-Id: Ib9602a9d1f09e6bd6c1306927990676120dff012
Adam Powell [Mon, 1 Jun 2015 22:40:22 +0000 (22:40 +0000)]
am
dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
* commit '
dc49d5f8ae9005a119172f72ccda1de9bc85c2d9':
Fix one-action choosers with EXTRA_INITIAL_INTENTS
Tyler Gunn [Mon, 1 Jun 2015 22:40:17 +0000 (22:40 +0000)]
am
29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
* commit '
29780eecd06bddcd33692c06075f8c5390b88357':
Cleanup Video API javadoc.
Tyler Gunn [Mon, 1 Jun 2015 22:40:13 +0000 (22:40 +0000)]
am
0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
* commit '
0feb9c9cf947deb893f5a400489ecf7e48626281':
IMS: Conference fixes
Dianne Hackborn [Mon, 1 Jun 2015 22:40:07 +0000 (22:40 +0000)]
am
9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
* commit '
9ed0c4109df27c0956f97b7a074c0b67daa0ebd8':
Update VoiceInteractionService from API review.
Adam Powell [Mon, 1 Jun 2015 22:37:37 +0000 (22:37 +0000)]
Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 22:35:28 +0000 (22:35 +0000)]
Merge "Cleanup Video API javadoc." into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 22:33:57 +0000 (22:33 +0000)]
Merge "IMS: Conference fixes" into mnc-dev
Dianne Hackborn [Mon, 1 Jun 2015 22:28:44 +0000 (22:28 +0000)]
Merge "Update VoiceInteractionService from API review." into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 22:15:08 +0000 (22:15 +0000)]
am
e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev
* commit '
e1c68765cf53473e710438f90e42e0cb26dffe1b':
ActionBar menu text should look like Button
Raph Levien [Mon, 1 Jun 2015 22:10:07 +0000 (22:10 +0000)]
am
fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
* commit '
fb2cdc4ca131ff95179414854eca02a098a29a8a':
Revert "Revert "Use getRunAdvance to position cursor""
Alan Viverette [Mon, 1 Jun 2015 22:10:02 +0000 (22:10 +0000)]
am
e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
* commit '
e0e5c1cf1965302fcf177eaade372313504ea53a':
Clean up AbsListView constructor
Robert Shih [Mon, 1 Jun 2015 22:09:57 +0000 (22:09 +0000)]
am
eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev
* commit '
eb8a51f359e4e1f4187eb14fa5e584979d26768b':
MediaPlayer: trigger onError instead of exception on stale native notifications
Alan Viverette [Mon, 1 Jun 2015 22:08:27 +0000 (22:08 +0000)]
Merge "ActionBar menu text should look like Button" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 21:41:58 +0000 (21:41 +0000)]
Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 21:56:34 +0000 (21:56 +0000)]
Merge "Clean up AbsListView constructor" into mnc-dev
Robert Shih [Mon, 1 Jun 2015 21:55:49 +0000 (21:55 +0000)]
Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 21:29:11 +0000 (14:29 -0700)]
IMS: Conference fixes
- Set phoneaccount to Conference
- Handle conference call in DIALING state
Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a
Bug:
21376607
Deepanshu Gupta [Mon, 1 Jun 2015 21:21:24 +0000 (14:21 -0700)]
LayoutLib: Skip classes from java package.
Classes in "java" package can't be defined at runtime anyway. No use
including them in LayoutLib.
Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73
Abodunrinwa Toki [Mon, 1 Jun 2015 21:42:27 +0000 (21:42 +0000)]
am
bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
* commit '
bdd500ecd4ceea7d4e4a06ece08c9b9fd5d8aec5':
Fix FloatingToolbar look and animation for RTL.
Eino-Ville Talvala [Mon, 1 Jun 2015 21:42:22 +0000 (21:42 +0000)]
am
14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev
* commit '
14438d122c1e7ab88a6169bca13a35d50e76e91e':
Camera2: Add tangential distortion coefficients
Andrew Flynn [Mon, 1 Jun 2015 21:42:08 +0000 (21:42 +0000)]
am
9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev
* commit '
9d28852f6108b20266de0282f4bf858e679316b7':
Remove separate light/dark animated vector drawables
Chris Craik [Mon, 1 Jun 2015 21:41:40 +0000 (21:41 +0000)]
am
8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev
* commit '
8c1e287bf801d98cbaa6df904524625c3935fdd0':
Fix RenderScript copy tracing sections
Deepanshu Gupta [Wed, 27 May 2015 19:35:56 +0000 (12:35 -0700)]
Skip warnings for some unresolved references.
Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.
Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.
Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
Raph Levien [Mon, 1 Jun 2015 21:34:47 +0000 (14:34 -0700)]
Revert "Revert "Use getRunAdvance to position cursor""
This reverts commit
5730c974800a0ffed59a041d9e249a5c42e417db.
Quddus Chong [Mon, 1 Jun 2015 21:31:23 +0000 (21:31 +0000)]
am
2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
* commit '
2b95561db50426779947ad5ab680994c24d79396':
docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
Abodunrinwa Toki [Mon, 1 Jun 2015 21:31:19 +0000 (21:31 +0000)]
Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
Eino-Ville Talvala [Mon, 1 Jun 2015 21:26:01 +0000 (21:26 +0000)]
Merge "Camera2: Add tangential distortion coefficients" into mnc-dev
Quddus Chong [Mon, 1 Jun 2015 21:05:12 +0000 (14:05 -0700)]
docs: Fixed typo for confirm credentials section in the API Overview.
bug:
21444273
Change-Id: I01700e95227e5f7c09a5d6428877087d7ff0121a
Andrew Flynn [Mon, 1 Jun 2015 21:11:51 +0000 (21:11 +0000)]
Merge "Remove separate light/dark animated vector drawables" into mnc-dev
Chris Craik [Mon, 1 Jun 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Fix RenderScript copy tracing sections" into mnc-dev
Robert Shih [Thu, 28 May 2015 01:11:44 +0000 (18:11 -0700)]
MediaPlayer: trigger onError instead of exception on stale native notifications
This change also reverted commit
2c838fbd87ad5685c0008b419ea02421159b9b70,
"MediaPlayer: add mPreparing to weed out unwanted prepared messages".
Bug:
21266735
Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d
Andrew Flynn [Mon, 1 Jun 2015 20:34:21 +0000 (16:34 -0400)]
Remove separate light/dark animated vector drawables
Now that AnimatedVectorDrawables can use themed animations, SysUI no longer
needs to track separate AVDs for the carrier network change icons.
Bug:
21118142
Change-Id: Ifb6d7b5e7e3de85c10bc13183b4142fd2e6714b6
Chris Tate [Mon, 1 Jun 2015 20:20:54 +0000 (20:20 +0000)]
am
88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
* commit '
88fb14532421f049614c34120c706c26a9af6bbd':
DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.
John Spurlock [Mon, 1 Jun 2015 20:13:03 +0000 (20:13 +0000)]
am
b0db15c6: Merge "Next alarm clock updates." into mnc-dev
* commit '
b0db15c6d99ab5f9d8a7bd6a44fc097a5f61edca':
Next alarm clock updates.
Andrew Flynn [Mon, 1 Jun 2015 20:12:53 +0000 (20:12 +0000)]
am
78b16987: Merge "Change colors of AVD test" into mnc-dev
* commit '
78b16987dfb044c8adbb19d2cd206a8aaeb6e850':
Change colors of AVD test
Chris Tate [Mon, 1 Jun 2015 20:11:56 +0000 (20:11 +0000)]
Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 20:07:38 +0000 (20:07 +0000)]
Merge "Next alarm clock updates." into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 20:04:06 +0000 (20:04 +0000)]
Merge "Change colors of AVD test" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 19:55:12 +0000 (19:55 +0000)]
am
cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
* commit '
cf8b3b1c56b5aaaa8552c1bc9bb88c8a1285f99f':
Revert "Use getRunAdvance to position cursor"
Jason Monk [Mon, 1 Jun 2015 19:55:08 +0000 (19:55 +0000)]
am
061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev
* commit '
061e2bbf6bdbcccd71844248be953081f2b5fe70':
Be more careful with mAccessPoints usage
Raph Levien [Mon, 1 Jun 2015 19:45:24 +0000 (19:45 +0000)]
Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:45:22 +0000 (19:45 +0000)]
Merge "Be more careful with mAccessPoints usage" into mnc-dev
Eino-Ville Talvala [Mon, 1 Jun 2015 19:39:54 +0000 (12:39 -0700)]
Camera2: Remove isLoggable
Change-Id: I83b2c8321ab6b48cf68ef7a4d724559ead1a1790
Raph Levien [Mon, 1 Jun 2015 19:40:42 +0000 (12:40 -0700)]
Revert "Use getRunAdvance to position cursor"
This reverts commit
cb5499c85097450c48f66f6c08a35bab2ad5ab12.
Bug:
21549197
Jorim Jaggi [Mon, 1 Jun 2015 19:18:29 +0000 (19:18 +0000)]
am
1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
* commit '
1e47a8e096fc28dcab0a55bc4f2e6b747bfb1a07':
Cleanup Keyguard handling when turning off screen
Filip Gruszczynski [Mon, 1 Jun 2015 19:18:25 +0000 (19:18 +0000)]
am
29c840eb: am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
29c840ebb08d97451fd5a5923ad20d7bf1990048':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:18:20 +0000 (19:18 +0000)]
am
4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
* commit '
4021117d0a78f89c9c9e5acc0e4d61092952e5f5':
Allow app to stop lockTaskMode if started by manifest attribute
Jorim Jaggi [Mon, 1 Jun 2015 19:13:10 +0000 (19:13 +0000)]
Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 19:09:57 +0000 (19:09 +0000)]
am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
11d50c9cc6f9990af5b9abf2058f6b7d4a5c8ae0':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:06:44 +0000 (19:06 +0000)]
Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:00:57 +0000 (15:00 -0400)]
Be more careful with mAccessPoints usage
Bug:
21559453
Change-Id: I1a0bcf7282ad1a651169dea7e8ac5bc618b580d1
Filip Gruszczynski [Mon, 1 Jun 2015 18:57:21 +0000 (18:57 +0000)]
am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
06756f352d2046246bc147fa1f55d1dfbfcb37f5':
Dismiss or cancel in SwipeDismissLayout on screen off.
Dianne Hackborn [Sat, 30 May 2015 00:58:53 +0000 (17:58 -0700)]
Update VoiceInteractionService from API review.
This may even manage to retain compatibility with existing
binaries! (For now.)
Change-Id: I3b1386287a6b9b20b57ac2e2444fd6f458837277
Wale Ogunwale [Mon, 1 Jun 2015 16:48:36 +0000 (09:48 -0700)]
Allow app to stop lockTaskMode if started by manifest attribute
It is possible lockTaskMode was started by the system process
because android:lockTaskMode is set to a locking value in the
application's manifest instead of the app calling
startLockTaskMode. In this case TaskRecord.mLockTaskUid will
be 0, so we compare the callingUid to the
TaskRecord.effectiveUid instead so the app can exit lockTaskMode.
Bug:
21464182
Change-Id: Ibca6de8e4b17051d5fcbb05cde9c8aefed7216f2
Alan Viverette [Mon, 1 Jun 2015 18:27:04 +0000 (11:27 -0700)]
ActionBar menu text should look like Button
Bug:
21560189
Change-Id: Idae6569a5b1c9e3e3ab297c4d057f37e9add9aaa
Winson Chung [Mon, 1 Jun 2015 18:23:41 +0000 (18:23 +0000)]
am
6920474b: Merge "Ensuring that we write to disk first." into mnc-dev
* commit '
6920474bac7c212dd384b6ef1134c59b73669942':
Ensuring that we write to disk first.
Winson Chung [Mon, 1 Jun 2015 18:23:37 +0000 (18:23 +0000)]
am
a74f385b: Allow long-pressing task icon to show app-info.
* commit '
a74f385ba08922c09aa812f0d6fd2903a633da01':
Allow long-pressing task icon to show app-info.
Winson Chung [Mon, 1 Jun 2015 18:19:44 +0000 (18:19 +0000)]
Merge "Ensuring that we write to disk first." into mnc-dev
Winson Chung [Fri, 29 May 2015 20:36:56 +0000 (13:36 -0700)]
Ensuring that we write to disk first.
Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2
Winson Chung [Fri, 29 May 2015 23:27:00 +0000 (16:27 -0700)]
Allow long-pressing task icon to show app-info.
Bug:
17369696
Yorke Lee [Mon, 1 Jun 2015 18:05:15 +0000 (18:05 +0000)]
am
064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev
* commit '
064fc83b81e215881c2ad22827741e6e9142f948':
Add ability to modify default dialer via ADB
Alan Viverette [Mon, 1 Jun 2015 18:05:09 +0000 (18:05 +0000)]
am
0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
* commit '
0ee2c1aef93987663968dbfd693cc5eda06c8244':
Prevent crash when ColorStateList has unresolved attrs
Yin-Chia Yeh [Mon, 1 Jun 2015 18:05:05 +0000 (18:05 +0000)]
am
254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
* commit '
254ed616712866518225dbc156182f39339e76a4':
Camera2: Add missing LEGACY available keys
Alex Klyubin [Mon, 1 Jun 2015 18:05:00 +0000 (18:05 +0000)]
am
0de6dea6: Merge "No need to specify key size when importing." into mnc-dev
* commit '
0de6dea6fb0c3b87e967c4c223f5edda359d1c8c':
No need to specify key size when importing.
Andres Morales [Mon, 1 Jun 2015 18:04:56 +0000 (18:04 +0000)]
am
0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
* commit '
0fddb1a63109e2d4a92327ea1ffc74307292be48':
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
Chien-Yu Chen [Mon, 1 Jun 2015 18:04:48 +0000 (18:04 +0000)]
am
61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
* commit '
61bae6d8de096c8982074ac507554fda42a802a5':
Camera2: update docs for reprocess timestamp
Yorke Lee [Mon, 1 Jun 2015 18:00:49 +0000 (18:00 +0000)]
Merge "Add ability to modify default dialer via ADB" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 18:00:05 +0000 (18:00 +0000)]
Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
Chris Craik [Mon, 1 Jun 2015 17:39:36 +0000 (10:39 -0700)]
Fix RenderScript copy tracing sections
bug:
21560057
Change-Id: I3b44d04bd908d9549ef7ada5f48f5d94e239d186
Yin-Chia Yeh [Mon, 1 Jun 2015 17:53:40 +0000 (17:53 +0000)]
Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
Alex Klyubin [Mon, 1 Jun 2015 17:53:28 +0000 (17:53 +0000)]
Merge "No need to specify key size when importing." into mnc-dev
Andres Morales [Mon, 1 Jun 2015 17:50:57 +0000 (17:50 +0000)]
Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
Chien-Yu Chen [Mon, 1 Jun 2015 17:50:54 +0000 (17:50 +0000)]
Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
Andres Morales [Mon, 1 Jun 2015 17:50:43 +0000 (17:50 +0000)]
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
This reverts commit
831e01a89e9636baf15d35e7f8ff5e9f290c8b87.
Change-Id: I48bf74631b842178964d25906b2790f18632e32a
OSDN Git Service
