OSDN Git Service
Geoff Mendal [Tue, 7 Oct 2014 00:39:51 +0000 (00:39 +0000)]
am
f2bef9cd: (-s ours) am
1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f2bef9cd1936c5d26d88c17b56746361af6e78f3':
Import translations. DO NOT MERGE
Yuncheol Heo [Tue, 7 Oct 2014 00:34:25 +0000 (00:34 +0000)]
am
d534b936: Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
* commit '
d534b936d70cd45d7dffd623ca16ec9b7fdbcbe2':
Change visibility of RecordSource into public.
Geoff Mendal [Tue, 7 Oct 2014 00:31:51 +0000 (00:31 +0000)]
am
1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
1d593ad47470150f751cc573eb56dae97470cf41':
Import translations. DO NOT MERGE
Yuncheol Heo [Tue, 7 Oct 2014 00:29:05 +0000 (00:29 +0000)]
Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
Selim Cinek [Tue, 7 Oct 2014 00:28:51 +0000 (00:28 +0000)]
am
79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
* commit '
79934acb40de31a7c4572bdb7a747edcb12bb8e4':
Fixed a crash when the detail panel got very big
Selim Cinek [Tue, 7 Oct 2014 00:22:32 +0000 (00:22 +0000)]
Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
Chris Craik [Tue, 7 Oct 2014 00:05:32 +0000 (00:05 +0000)]
am
0aa69ff2: am
1a6c41fb: am
6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
* commit '
0aa69ff2ff9e8556f4963b7dfdad56996a604392':
Avoid changeBounds animations on Views that are not yet laidout
Mike Lockwood [Tue, 7 Oct 2014 00:05:28 +0000 (00:05 +0000)]
am
bb68c263: am
3df6b76c: am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
bb68c263620fe91eefb241efaf099742b3e6069c':
Add support for playing audio during bootanimation
Mathieu Chartier [Tue, 7 Oct 2014 00:05:24 +0000 (00:05 +0000)]
am
5ade30e8: am
405a934e: am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
5ade30e82e05c783d74e3a52316be4c3ed11239c':
Fix incorrect JNI_ABORT
Jinsuk Kim [Mon, 6 Oct 2014 23:55:09 +0000 (23:55 +0000)]
am
84659edd: Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
* commit '
84659edd41b0bc7ecde645405e926a641e704824':
CEC: Send <Device Vendor ID> after address allocation
Geoff Mendal [Mon, 6 Oct 2014 23:55:05 +0000 (23:55 +0000)]
am
a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
a6b027084cdeefcd431a4e6b46c1718ed3dfb874':
Import translations. DO NOT MERGE
Jinsuk Kim [Mon, 6 Oct 2014 23:55:02 +0000 (23:55 +0000)]
am
85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
* commit '
85c927cfc264eda39a13ac224197525c5fae8bbc':
CEC: Ensure the key transmission finishes all the time
Selim Cinek [Mon, 6 Oct 2014 23:54:46 +0000 (16:54 -0700)]
Fixed a crash when the detail panel got very big
An example was when we have many casting devices or users,
it was simply crashing. Also fixed a bug where the background
would not be drawn anymore.
Bug:
17699850
Change-Id: Ibdb8f75f53da2806dcd7dd1386ebcc345b012f47
Chris Craik [Mon, 6 Oct 2014 23:51:05 +0000 (23:51 +0000)]
am
1a6c41fb: am
6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
* commit '
1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d':
Avoid changeBounds animations on Views that are not yet laidout
Mike Lockwood [Mon, 6 Oct 2014 23:51:00 +0000 (23:51 +0000)]
am
3df6b76c: am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
3df6b76c5f6ca38f986305c805c9d90e0b861a41':
Add support for playing audio during bootanimation
Mathieu Chartier [Mon, 6 Oct 2014 23:50:55 +0000 (23:50 +0000)]
am
405a934e: am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
405a934ec46fccf7d2e6e573bb65a5be4b51665a':
Fix incorrect JNI_ABORT
Jinsuk Kim [Mon, 6 Oct 2014 23:48:19 +0000 (23:48 +0000)]
Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
Jinsuk Kim [Mon, 6 Oct 2014 22:43:44 +0000 (07:43 +0900)]
CEC: Send <Device Vendor ID> after address allocation
This is required to pass CTS 11.2.9-2.
Bug:
17882288
Change-Id: Ie2823be8635a458a63a95abd44135035667d5836
Geoff Mendal [Mon, 6 Oct 2014 23:39:11 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 23:34:09 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 6 Oct 2014 23:29:47 +0000 (23:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Jinsuk Kim [Mon, 6 Oct 2014 23:15:32 +0000 (23:15 +0000)]
Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
Wei Liu [Mon, 6 Oct 2014 22:39:05 +0000 (22:39 +0000)]
am
de93b104: am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
de93b1049eb84ccdb30e9eb7dd1f255a82e41918':
Hide bug report notification in Android Framework from watches.
Chris Craik [Mon, 6 Oct 2014 22:35:19 +0000 (22:35 +0000)]
am
6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
* commit '
6c9f0a01602697aaed99f54c4db0d6296701ed43':
Avoid changeBounds animations on Views that are not yet laidout
Mike Lockwood [Mon, 6 Oct 2014 22:35:13 +0000 (22:35 +0000)]
am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
56b7d562af4dd0e7bd04163fe9a86a801fcff1fe':
Add support for playing audio during bootanimation
Mathieu Chartier [Mon, 6 Oct 2014 22:35:09 +0000 (22:35 +0000)]
am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
Fix incorrect JNI_ABORT
Wei Liu [Mon, 6 Oct 2014 22:35:09 +0000 (22:35 +0000)]
am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
a940f8656d5ca6eb2d737a9a480166c760684ee0':
Hide bug report notification in Android Framework from watches.
ztenghui [Mon, 6 Oct 2014 22:23:10 +0000 (22:23 +0000)]
am
8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
* commit '
8cdb0bc08728f18b75eca429678ea9b778191b6e':
Use float instead of double to increase spot shadow perf
Wei Liu [Mon, 6 Oct 2014 22:10:32 +0000 (22:10 +0000)]
Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
Chris Craik [Mon, 6 Oct 2014 22:06:22 +0000 (22:06 +0000)]
Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 22:04:49 +0000 (15:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b7537a5a607ad61da0b24e1826dc0876bb3f50d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 22:01:42 +0000 (15:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f46ae080f4869329e7bb9b55f06dc37f2df9af0
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 21:58:45 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I157884cf5f8c29c59f1365a28578d988a0a357a5
Auto-generated-cl: translation import
Chris Craik [Mon, 6 Oct 2014 21:50:59 +0000 (14:50 -0700)]
Avoid changeBounds animations on Views that are not yet laidout
bug:
17683930
This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.
Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
Wei Liu [Mon, 6 Oct 2014 21:50:10 +0000 (14:50 -0700)]
Hide bug report notification in Android Framework from watches.
Bug:
17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
Mike Lockwood [Mon, 6 Oct 2014 20:50:18 +0000 (20:50 +0000)]
Merge "Add support for playing audio during bootanimation" into lmp-dev
Mathieu Chartier [Mon, 6 Oct 2014 20:27:07 +0000 (20:27 +0000)]
Merge "Fix incorrect JNI_ABORT" into lmp-dev
ztenghui [Mon, 6 Oct 2014 20:04:05 +0000 (20:04 +0000)]
Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
Mathieu Chartier [Mon, 6 Oct 2014 19:42:00 +0000 (12:42 -0700)]
Fix incorrect JNI_ABORT
If there is a copy, JNI_ABORT does NOT copy back into the
corresponding java array. Changing this to 0 is what you want since
this will copy the data back if needed and free the temporary
storage.
Bug:
16858794
Change-Id: I3f3b426ea3cbba577bb720532c16ebf7493f1c1c
Amit Mahajan [Mon, 6 Oct 2014 19:36:44 +0000 (19:36 +0000)]
am
384ff9ef: am
15c581fa: am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
384ff9ef5d2dc1278f63eb7e0f42ad03a9163dec':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:36:41 +0000 (19:36 +0000)]
am
aece3ec5: (-s ours) am
ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
aece3ec51115abc11ec580f2823f6ec0ef62e7d6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:32:05 +0000 (19:32 +0000)]
am
f132e7ef: (-s ours) am
aa5c62f3: (-s ours) am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
f132e7ef0ece5a31595153ec71ef539b4c40f706':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:32:01 +0000 (19:32 +0000)]
am
3dd06aba: am
39006668: am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
3dd06aba8074fd3de68659f97d0136e05fc44c81':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:31:57 +0000 (19:31 +0000)]
am
2f577e83: am
90d557b7: am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
2f577e83cbd5b12e47178a90443390210b446102':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Geoff Mendal [Mon, 6 Oct 2014 19:31:52 +0000 (19:31 +0000)]
am
4795dfba: (-s ours) am
3647aba8: (-s ours) am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4795dfba7fb5f7c03e1f85ec2464258f4987d364':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:31:49 +0000 (19:31 +0000)]
am
b6f5cb3e: am
81b96aad: am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
b6f5cb3e45c9d4cf891d0ee024e7073f6d139677':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:31:44 +0000 (19:31 +0000)]
am
da81acdf: am
ed2237ae: am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
da81acdffe587e997507cea39b47bf32018cf7ae':
Removed preview license.
Amit Mahajan [Mon, 6 Oct 2014 19:28:53 +0000 (19:28 +0000)]
am
15c581fa: am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
15c581fa4c0dcff09d2fd65d6978f286b8b23b94':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:28:44 +0000 (19:28 +0000)]
am
ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ce2b1e8cfaa67f27502d4db837d197409453aae4':
Import translations. DO NOT MERGE
Amit Mahajan [Mon, 6 Oct 2014 19:23:20 +0000 (19:23 +0000)]
am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
17d7c79650664c7a112ab175cb2329d2062f4d1e':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:23:03 +0000 (19:23 +0000)]
am
aa5c62f3: (-s ours) am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
aa5c62f35999c2dc165771740e96c30b1b932aeb':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:22:59 +0000 (19:22 +0000)]
am
39006668: am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
39006668235f9cdeac853911426b1543d3b092d0':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:22:53 +0000 (19:22 +0000)]
am
90d557b7: am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
90d557b7a68e64e049a44560b76b959ef87f13d7':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Geoff Mendal [Mon, 6 Oct 2014 19:22:48 +0000 (19:22 +0000)]
am
3647aba8: (-s ours) am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
3647aba82d30143e301d4bb251085f79308d872a':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:22:44 +0000 (19:22 +0000)]
am
81b96aad: am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
81b96aadbdc3726186c91b51465fb21ead56888a':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:22:40 +0000 (19:22 +0000)]
am
ed2237ae: am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
ed2237aec8d348ee530f0c88c08392351690e5bb':
Removed preview license.
Geoff Mendal [Mon, 6 Oct 2014 19:21:52 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 19:21:34 +0000 (19:21 +0000)]
am
b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
b04130409494065d36e4bf4a602716de8836e0f5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:21:01 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 6 Oct 2014 19:18:36 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 6 Oct 2014 19:17:23 +0000 (19:17 +0000)]
am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
712363889899bfff564a39ef4d88ff048a9e5ec7':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:17:17 +0000 (19:17 +0000)]
am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
bbebe42309a7012e0474b916f5209027889e8d57':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:17:10 +0000 (19:17 +0000)]
am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
7f7d240b13b96b617e298c6178af0425308f5ef9':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Amit Mahajan [Mon, 6 Oct 2014 19:17:05 +0000 (19:17 +0000)]
Merge "ATT: Call does not establish to '*1'" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 19:17:04 +0000 (19:17 +0000)]
am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ec763118370e1fa79acb96b82a7ad37b6f2cc02e':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:16:53 +0000 (19:16 +0000)]
am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:16:47 +0000 (19:16 +0000)]
am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
2dd86d50ae19efa071d83e02545b2767c351fdd6':
Removed preview license.
Geoff Mendal [Mon, 6 Oct 2014 19:10:24 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Christopher Tate [Mon, 6 Oct 2014 19:09:11 +0000 (19:09 +0000)]
Merge "adb backup/restore fixes" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 19:08:45 +0000 (12:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I97d45a200138bb1a232327dacf2f933b69efc6ec
Auto-generated-cl: translation import
Bing Gao [Fri, 3 Oct 2014 19:56:04 +0000 (12:56 -0700)]
ATT: Call does not establish to '*1'
Bug:
17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
Benson Huang [Mon, 6 Oct 2014 18:58:35 +0000 (18:58 +0000)]
am
1e62e476: am
ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit '
1e62e476fa6600dbf8dd82a428efb424a9938177':
[FM] Add FM_TUNER audio source to support L version FM radio app
Geoff Mendal [Mon, 6 Oct 2014 18:57:11 +0000 (11:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icce86f4ac15c45a9592f2c6f4cf2f8232cb0605e
Auto-generated-cl: translation import
Benson Huang [Mon, 6 Oct 2014 18:54:19 +0000 (18:54 +0000)]
am
ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit '
ce4483cb83afb3a42a32ef2cb00cf04d6f9018fd':
[FM] Add FM_TUNER audio source to support L version FM radio app
Benson Huang [Wed, 17 Sep 2014 09:21:02 +0000 (17:21 +0800)]
[FM] Add FM_TUNER audio source to support L version FM radio app
1.MediaRecorder.java: Add FM_TUNER audio source type for FM record.
2.AudioRecord.java: For FM output to the other device,
(except the headset case), record the FM tuner signal to a track
and playback the recorded signal by a track.
3.AudioAttributes.java: Thus we use AudioRecord, need to modify
setCapturePreset to support MediaRecorder.AudioSource.FM_TUNER.
Review: https://partner-android-review.git.corp.google.com/#/c/182071
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
Change-Id: If068d0bbbffb4848887004396a8a8d9bcba1334e
Geoff Mendal [Mon, 6 Oct 2014 18:49:17 +0000 (18:49 +0000)]
am
1c837af0: (-s ours) am
937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
1c837af01db817dea4d37ad62c5587b04352ba54':
Import translations. DO NOT MERGE
Dianne Hackborn [Mon, 6 Oct 2014 18:48:33 +0000 (18:48 +0000)]
Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 18:46:22 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia892f6f28e8ad353ae460f3e167bb68d2246ac13
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 18:38:41 +0000 (18:38 +0000)]
am
937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
937d6a6476be3ce06f3c9c10836a4399b7514231':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:36:44 +0000 (18:36 +0000)]
am
88bc51ff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
88bc51ffcab7c636b5d0b2f8f309b20c6321e89b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:34:20 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 18:33:45 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 18:33:29 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 6 Oct 2014 18:32:34 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 6 Oct 2014 18:32:18 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 17:56:58 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 17:56:03 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id44a50fdb0bd6b01fa0a3930647b310dd44d4674
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 17:55:10 +0000 (10:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieb7aeaea1204f4ba7daf3abd7a30f647564807dd
Auto-generated-cl: translation import
John Spurlock [Mon, 6 Oct 2014 17:54:40 +0000 (17:54 +0000)]
Merge "Fix NPE in StrictMode handling." into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 17:54:01 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
Andrew Solovay [Mon, 6 Oct 2014 17:51:52 +0000 (17:51 +0000)]
Merge "Removed preview license." into lmp-dev
Adam Powell [Mon, 6 Oct 2014 17:17:36 +0000 (17:17 +0000)]
am
00092db1: Fix build breakage in API check
* commit '
00092db1af06d0434cae88aa736be9ed539e2a9c':
Fix build breakage in API check
Adam Powell [Mon, 6 Oct 2014 17:11:43 +0000 (10:11 -0700)]
Fix build breakage in API check
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
Yuncheol Heo [Mon, 6 Oct 2014 16:47:14 +0000 (16:47 +0000)]
am
345f3d00: am
4cb8455f: am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
345f3d00b8dccb68988bdf9f6fb069fcfe06bb24':
CEC: Reset active source status on routing control
Benjamin Franz [Mon, 6 Oct 2014 16:47:11 +0000 (16:47 +0000)]
am
31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
* commit '
31409c0ccd1434efdcfff8f7ddcd7c4207660104':
Introduce new API to get an unbadged icon and unbadge permissions.
John Spurlock [Mon, 6 Oct 2014 16:36:45 +0000 (12:36 -0400)]
Fix NPE in StrictMode handling.
Bug:
17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
Yuncheol Heo [Mon, 6 Oct 2014 16:30:02 +0000 (16:30 +0000)]
am
4cb8455f: am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
4cb8455fba9b70339bacf28ff813118ad542165d':
CEC: Reset active source status on routing control
Benjamin Franz [Mon, 6 Oct 2014 16:26:24 +0000 (16:26 +0000)]
Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
Yuncheol Heo [Mon, 6 Oct 2014 16:22:17 +0000 (16:22 +0000)]
am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
71c4578def00a5a4b9e159fd1ab88e616bc7e159':
CEC: Reset active source status on routing control
Yuncheol Heo [Mon, 6 Oct 2014 16:16:45 +0000 (16:16 +0000)]
Merge "CEC: Reset active source status on routing control" into lmp-dev
OSDN Git Service
