OSDN Git Service
Geoff Mendal [Tue, 7 Oct 2014 00:20:34 +0000 (00:20 +0000)]
am
1180831b: (-s ours) am
bfa09525: (-s ours) am
a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
1180831b64a9358946ef96e0e751bbade5f9dece':
Import translations. DO NOT MERGE
Jinsuk Kim [Tue, 7 Oct 2014 00:20:29 +0000 (00:20 +0000)]
am
4f729b3f: am
a3ad702f: am
85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
* commit '
4f729b3fc790069b16ae0f8401a7f2d8efd1e057':
CEC: Ensure the key transmission finishes all the time
Geoff Mendal [Tue, 7 Oct 2014 00:13:02 +0000 (00:13 +0000)]
am
bfa09525: (-s ours) am
a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
bfa09525ab4b307ebe8f4e38f8b3ac6aee19e466':
Import translations. DO NOT MERGE
Jinsuk Kim [Tue, 7 Oct 2014 00:12:58 +0000 (00:12 +0000)]
am
a3ad702f: am
85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
* commit '
a3ad702f38b17fe27d5f73bb98a123959ada59ac':
CEC: Ensure the key transmission finishes all the time
Geoff Mendal [Tue, 7 Oct 2014 00:12:02 +0000 (00:12 +0000)]
am
b65c9a1b: (-s ours) am
a997d0e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
b65c9a1bbe2c5bddbe97543f4626867192ed09ff':
Import translations. DO NOT MERGE
Wei Liu [Tue, 7 Oct 2014 00:11:58 +0000 (00:11 +0000)]
am
38f4d482: am
a84130d3: am
de93b104: am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
38f4d4828827acc9ecda0925fa298eea87ecfba5':
Hide bug report notification in Android Framework from watches.
Geoff Mendal [Tue, 7 Oct 2014 00:06:00 +0000 (00:06 +0000)]
am
a997d0e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
a997d0e3b6e46fdeaa8d91ea306c0ce7602aa52b':
Import translations. DO NOT MERGE
Wei Liu [Tue, 7 Oct 2014 00:05:56 +0000 (00:05 +0000)]
am
a84130d3: am
de93b104: am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
a84130d3e45ad1ac4cb5843adc027d463c3c304d':
Hide bug report notification in Android Framework from watches.
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
Geoff Mendal [Mon, 6 Oct 2014 23:45:39 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Oct 2014 23:44:49 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Geoff Mendal [Mon, 6 Oct 2014 23:26:35 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Oct 2014 23:21:55 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Geoff Mendal [Mon, 6 Oct 2014 23:10:37 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Oct 2014 23:06:53 +0000 (23:06 +0000)]
Merge "Import translations. DO NOT MERGE"
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.
ztenghui [Mon, 6 Oct 2014 22:36:31 +0000 (22:36 +0000)]
am
0a04e311: am
f11d9de4: am
8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
* commit '
0a04e3119891d52f69c08d0ce42777cba3566b39':
Use float instead of double to increase spot shadow perf
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:31:33 +0000 (22:31 +0000)]
am
f11d9de4: am
8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
* commit '
f11d9de43af807ad9d72a62fd1167ff6f9e7b903':
Use float instead of double to increase spot shadow perf
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
Geoff Mendal [Mon, 6 Oct 2014 22:18:55 +0000 (15:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ac9099171c7deb2e9f56f29cb8a3a124e54e45c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 22:17:06 +0000 (15:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia61d25e126fd677f5d3dcded34a56e782cd8fea8
Auto-generated-cl: translation import
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
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
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
Geoff Mendal [Mon, 6 Oct 2014 21:49:04 +0000 (14:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ed4abf1dbac2d0aae2cd37c57e41d38e6dc31e4
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 21:35:42 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibd8d225f7dba901fb1f0a00afb4fd315fd569b66
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 21:31:31 +0000 (14:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e0eb258692fe12c5dfa54a73e661f7f547d08aa
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 21:29:26 +0000 (14:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6d1b79cace46a30dc77ef019f7d28ccadd4f33a
Auto-generated-cl: translation import
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
Amit Mahajan [Mon, 6 Oct 2014 19:48:38 +0000 (19:48 +0000)]
am
97221b97: am
40f43c7a: am
384ff9ef: am
15c581fa: am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
97221b97eec10527b27d4328158ed1b463edfcca':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:48:33 +0000 (19:48 +0000)]
am
835d1d20: (-s ours) am
1c8487c8: (-s ours) am
aece3ec5: (-s ours) am
ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
835d1d2004c0b6f51c0c6f422c2d319d7334b05c':
Import translations. DO NOT MERGE
Amit Mahajan [Mon, 6 Oct 2014 19:44:29 +0000 (19:44 +0000)]
am
40f43c7a: am
384ff9ef: am
15c581fa: am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
40f43c7aea1bf96846c47ee8fb6766763110d2fc':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:44:22 +0000 (19:44 +0000)]
am
1c8487c8: (-s ours) am
aece3ec5: (-s ours) am
ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
1c8487c80e655eca8bcd13eaf39180123f79b124':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:44:09 +0000 (19:44 +0000)]
am
dd67eb7a: (-s ours) am
62c39bbe: (-s ours) am
f132e7ef: (-s ours) am
aa5c62f3: (-s ours) am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
dd67eb7aca95ae559ed362c2c2eb05b8fc26b65e':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:44:04 +0000 (19:44 +0000)]
am
9513c08c: am
dd8541d7: am
3dd06aba: am
39006668: am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
9513c08c3aaae4227b60f2a3c676b658e50e282c':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:43:58 +0000 (19:43 +0000)]
am
8b718b80: am
db75703b: am
2f577e83: am
90d557b7: am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
8b718b80e0caf179a174f8417fe4f5b875297de6':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Geoff Mendal [Mon, 6 Oct 2014 19:43:53 +0000 (19:43 +0000)]
am
9d27bbd5: (-s ours) am
45a2eb94: (-s ours) am
4795dfba: (-s ours) am
3647aba8: (-s ours) am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9d27bbd5bc0d1171420a16fe851e2347a3e5e028':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:43:49 +0000 (19:43 +0000)]
am
29ab5f7d: am
42730c93: am
b6f5cb3e: am
81b96aad: am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
29ab5f7dc0e9ba2ef3db2993d9ac5f9a48e9df12':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:43:44 +0000 (19:43 +0000)]
am
3fdf5132: am
5ae2730b: am
da81acdf: am
ed2237ae: am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
3fdf51327ab4cce6cc990031fbefb85f14444371':
Removed preview license.
Geoff Mendal [Mon, 6 Oct 2014 19:40:01 +0000 (19:40 +0000)]
am
62c39bbe: (-s ours) am
f132e7ef: (-s ours) am
aa5c62f3: (-s ours) am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
62c39bbe2e18bbf010ea83ac85e00be0c4be31fb':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:39:54 +0000 (19:39 +0000)]
am
dd8541d7: am
3dd06aba: am
39006668: am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
dd8541d7812e7d9dc8d0f8c36b3c740a27b4c627':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:39:50 +0000 (19:39 +0000)]
am
db75703b: am
2f577e83: am
90d557b7: am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
db75703b261e1d1446cca210d7dcafa3279c31bc':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Geoff Mendal [Mon, 6 Oct 2014 19:39:46 +0000 (19:39 +0000)]
am
45a2eb94: (-s ours) am
4795dfba: (-s ours) am
3647aba8: (-s ours) am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
45a2eb9452e6323abbad5bdb4fa8e7aa161e7a99':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:39:41 +0000 (19:39 +0000)]
am
42730c93: am
b6f5cb3e: am
81b96aad: am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
42730c93466d2ff533b42f56b4dd0080aad40d59':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:39:36 +0000 (19:39 +0000)]
am
5ae2730b: am
da81acdf: am
ed2237ae: am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
5ae2730bce75c32954c718190675f6b49b6f4da5':
Removed preview license.
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.
Geoff Mendal [Mon, 6 Oct 2014 19:31:25 +0000 (19:31 +0000)]
am
5d6132be: (-s ours) am
4c3ac5a2: (-s ours) am
b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
5d6132be350c76ec1efbffe26d2a22f2caf8bb29':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:31:21 +0000 (19:31 +0000)]
am
d60fed60: (-s ours) am
c1609420: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
d60fed600acfa955128d045231ffe873a2330335':
Import translations. DO NOT MERGE
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
Geoff Mendal [Mon, 6 Oct 2014 19:26:16 +0000 (19:26 +0000)]
am
4c3ac5a2: (-s ours) am
b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
4c3ac5a2a5a8ba22ae9f8263fc4db11cf8fa3c19':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:26:12 +0000 (19:26 +0000)]
am
c1609420: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
c160942009747135472509b00c3a97b4462cec0f':
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
Benson Huang [Mon, 6 Oct 2014 19:08:51 +0000 (19:08 +0000)]
am
6ad95c30: am
37fa980c: am
1e62e476: am
ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit '
6ad95c301c7dbc48378e780a9bc84add2849770e':
[FM] Add FM_TUNER audio source to support L version FM radio app
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
Benson Huang [Mon, 6 Oct 2014 19:03:38 +0000 (19:03 +0000)]
am
37fa980c: am
1e62e476: am
ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit '
37fa980c55c1b5fab84110eb0355cffbae74a692':
[FM] Add FM_TUNER audio source to support L version FM radio app
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
Geoff Mendal [Mon, 6 Oct 2014 18:59:08 +0000 (18:59 +0000)]
am
cf8048f5: (-s ours) am
5a35aba8: (-s ours) am
1c837af0: (-s ours) am
937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
cf8048f562daafd8779d16f41cc0381d8712b1d9':
Import translations. DO NOT MERGE
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
Geoff Mendal [Mon, 6 Oct 2014 18:53:29 +0000 (18:53 +0000)]
am
5a35aba8: (-s ours) am
1c837af0: (-s ours) am
937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
5a35aba8a7609ca601f882e9fe09d88b74e3236f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:51:58 +0000 (18:51 +0000)]
am
21a30fc0: (-s ours) am
1ceb0f2e: (-s ours) am
88bc51ff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
21a30fc0b29453e451fbb22b422647e921e938f2':
Import translations. DO NOT MERGE
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:38 +0000 (18:46 +0000)]
am
74331717: (-s ours) am
f9c11d90: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
7433171777e828835a492ae7f883207ac91d6b6e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:46:29 +0000 (18:46 +0000)]
am
1ceb0f2e: (-s ours) am
88bc51ff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
1ceb0f2ea4e7bb11127e8360ca7e74c862500e18':
Import translations. DO NOT MERGE
OSDN Git Service
