OSDN Git Service
Sungsoo [Fri, 14 Oct 2016 20:05:41 +0000 (20:05 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f am:
30404396be am:
d7475b491d -s ours am:
3069b72d76 am:
20b502a6b1
am:
97d7eba123 -s ours
Change-Id: I5725c9dba9ad2d20728738ecf0e4738f55603ac8
Sungsoo [Fri, 14 Oct 2016 20:04:41 +0000 (20:04 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded am:
d3f3729a17 am:
9d675aadf1 -s ours am:
3ab3eff7c1 am:
b25d26c40c
am:
5e2766e93e -s ours
Change-Id: I2d259112685e8462fd382c44390fb242058ef70a
Sungsoo [Fri, 14 Oct 2016 20:03:37 +0000 (20:03 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1 am:
7bb855a973 am:
68469a695e -s ours am:
b4fdad2b8c am:
93b3e8e606
am:
6dac084668 -s ours
Change-Id: I2761c5eae18e85e55bbde2c05eec6d6a65480091
Sungsoo [Fri, 14 Oct 2016 20:02:40 +0000 (20:02 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca am:
016c5889bc am:
d6508621fc -s ours am:
b576f816c5 am:
315b8b7bbc
am:
adb0afcef1 -s ours
Change-Id: I10e18ba16e72a8ec35c49af53c67161cc0e2590e
Sungsoo Lim [Fri, 14 Oct 2016 20:01:25 +0000 (20:01 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e am:
013d3a4964
am:
9da35bbaad
Change-Id: Id45b326022e64b4a887552a932068ae4661fa2a6
Sungsoo [Fri, 14 Oct 2016 20:00:16 +0000 (20:00 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801 am:
6e01f028ab
am:
e441ce97a8
Change-Id: Ie090e52708d58c6965aba75a3162757b442d5a19
Svetoslav Ganov [Fri, 14 Oct 2016 19:58:35 +0000 (19:58 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" am:
c98b34bdce am:
72510e6244 am:
cf146edb32
am:
a6b3788891
Change-Id: Id16507a948dec243f4f04afdc6e54668759a0fa9
Bert McMeen [Fri, 14 Oct 2016 19:57:34 +0000 (19:57 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e am:
4c5141b98b
am:
74217dfeba
Change-Id: I8de80fa266d0e005b1ee8410ac5fab8cd924a471
Yuta Yamada [Fri, 14 Oct 2016 19:56:39 +0000 (19:56 +0000)]
Merge "Fix memory leak of Dnd tile" am:
6057a8360a am:
465397e28e am:
be3b53beca
am:
dd1bd9875f
Change-Id: Ifa54d483f383183ca4fd0864e514d399022db632
Selim Cinek [Fri, 14 Oct 2016 19:55:26 +0000 (19:55 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am:
6f3a05ae77 -s ours am:
20307881d7 -s ours am:
e58f1e5965
am:
f69a47fcdc -s ours
Change-Id: I63d0ced98812deb638ba5f18d5714587814c2dc9
Selim Cinek [Fri, 14 Oct 2016 19:54:22 +0000 (19:54 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string" am:
d33e79c328 -s ours am:
cb654a5fbd -s ours am:
8bd7df4536
am:
c01d969abf -s ours
Change-Id: I751abbad21cd2b9db34d6f3445a56c0183c1f5e2
Robert Greenwalt [Fri, 14 Oct 2016 19:53:11 +0000 (19:53 +0000)]
Merge "Add free short codes for direct carrier billing and others" am:
73c50f7dbc am:
6f8c54a16d am:
2b06e19f2d
am:
c8c013f88d
Change-Id: I4aa6e7a91c1aa5e228443ae994fc149f9fd3f4ba
Shinji Sogo [Fri, 14 Oct 2016 19:52:14 +0000 (19:52 +0000)]
Merge "Don't compare FQDN with providerFriendlyName" am:
aae64557e1 am:
9c84160545 am:
b8bab1df10
am:
dafb19bb59
Change-Id: Id05db87f864df47245a748531cbdad4b27f6da1c
Adam Lesinski [Fri, 14 Oct 2016 19:51:05 +0000 (19:51 +0000)]
Merge "RRO: Synchronize access to overlays.list" am:
78382db820 am:
1b9303e8f0 am:
c68597e671
am:
29331aed30
Change-Id: Ibd05ff10372089e1b9ebed22d3e20fa6e5cc5f3a
Jorim Jaggi [Fri, 14 Oct 2016 19:49:57 +0000 (19:49 +0000)]
Merge "Fix split-screen flash issue" am:
6738617652 am:
f1fed4de21 am:
4e7407a80e
am:
3f23c9f36e
Change-Id: I195eee0b57f216ab1778d74fc7ec72b6d36e244b
Rebecca Silberstein [Fri, 14 Oct 2016 19:48:54 +0000 (19:48 +0000)]
Merge "Tethering: check if configManager is null" am:
e011bf80c5 am:
d1e4dbf002 am:
d33a0ee710
am:
e0a27e855b
Change-Id: I0c1fc0ca1458a322a1d225d6271c5616d00b2b50
Brad Ebinger [Fri, 14 Oct 2016 19:47:28 +0000 (19:47 +0000)]
Merge "Transplant the Logging system from Telecom" am:
cbb03d1ad3 am:
951dca8209 am:
0ab9a078e9
am:
be243f5b84
Change-Id: I7ecfb9d748df18a1b5625138b5b402fb1bdecbea
Christopher Wiley [Fri, 14 Oct 2016 19:44:26 +0000 (19:44 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats" am:
6408e2e5cc am:
eedd2b529d am:
53d12379f4
am:
5f9fedc5d7
Change-Id: Id23911d3ff1e90cf88711a7aa7749acdd81a26ae
John Reck [Fri, 14 Oct 2016 19:43:20 +0000 (19:43 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs" am:
2dc11c0500 am:
ee3adf6d91 am:
f136fa872f
am:
11cbf7b830
Change-Id: Ia982ffd2819b59515afecdf6f18c72f36ea86a23
Andre Eisenbach [Fri, 14 Oct 2016 19:42:16 +0000 (19:42 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am:
5c043f51b0 am:
3c3329bd34 am:
d6a85bdea3
am:
9c45a3184e
Change-Id: I2acd3943375a0cc1e271bd7cec8b3cbfd4f6f248
Andreas Gampe [Fri, 14 Oct 2016 19:41:14 +0000 (19:41 +0000)]
Merge "Debug: Use UniqueFile" am:
546f755bf8 am:
8d151b26c2 am:
77a2f22f77
am:
34030a16ba
Change-Id: Iae938803213da2bb3b05204c1796ffa4babb39d0
Selim Cinek [Fri, 14 Oct 2016 19:39:58 +0000 (19:39 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature" am:
a0322d5c5a -s ours am:
00c553e1ba -s ours am:
8f681f7220
am:
b05ceb233e -s ours
Change-Id: If0087103642b7ff1907665711c4a5821ac8beff4
lei.peng [Fri, 14 Oct 2016 19:38:59 +0000 (19:38 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am:
80587da3c1 am:
93c75d07c1 am:
d975003af3
am:
167f01a13a -s ours
Change-Id: I218c0eae30e8279284792e9e3fe119ee879b1826
TreeHugger Robot [Fri, 14 Oct 2016 19:36:16 +0000 (19:36 +0000)]
Merge "Fixed issue with IME window not been added to its window token"
Android Build Merger (Role) [Fri, 14 Oct 2016 18:46:53 +0000 (18:46 +0000)]
Merge "Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master am:
6accb573ab am:
7cbe133507 am:
85f037acd0"
Stephen Li [Fri, 14 Oct 2016 18:46:13 +0000 (18:46 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master am:
6accb573ab am:
7cbe133507
am:
85f037acd0
Change-Id: I4dfbbc144ac3d3661b03414b420bcddcc47ff4cf
Android Build Merger (Role) [Fri, 14 Oct 2016 18:45:56 +0000 (18:45 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig am:
e5535d71fc am:
90c20a884d am:
e979b73f77"
Jordan Liu [Fri, 14 Oct 2016 18:45:07 +0000 (18:45 +0000)]
Add cdma_3waycall_flash_delay key to CarrierConfig am:
e5535d71fc am:
90c20a884d
am:
e979b73f77
Change-Id: I2e698029b3b19f99b4b01b18ee2dc01d7e1ca214
Android Build Merger (Role) [Fri, 14 Oct 2016 18:44:38 +0000 (18:44 +0000)]
Merge "Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master am:
302b99512f am:
5428d11e23 am:
2f459f1c0a"
Stephen Li [Fri, 14 Oct 2016 18:43:48 +0000 (18:43 +0000)]
Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master am:
302b99512f am:
5428d11e23
am:
2f459f1c0a
Change-Id: I4e2cfe22e189ba3935fd53104db62980d18504f1
Android Build Merger (Role) [Fri, 14 Oct 2016 18:43:27 +0000 (18:43 +0000)]
Merge "Merge "resolve merge conflicts of
8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am:
adb4389cc1 am:
9a7c9a51f6"
Robert Sesek [Fri, 14 Oct 2016 18:42:01 +0000 (18:42 +0000)]
Merge "resolve merge conflicts of
8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am:
adb4389cc1
am:
9a7c9a51f6
Change-Id: Ib5b31740315a1bfd1da3b244b607ba390c4ec66a
Android Build Merger (Role) [Fri, 14 Oct 2016 18:41:41 +0000 (18:41 +0000)]
Merge "Merge "resolve merge conflicts of
0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am:
856a791ddd"
Android Build Merger (Role) [Fri, 14 Oct 2016 18:41:21 +0000 (18:41 +0000)]
Merge "resolve merge conflicts of
0b58f19 to nyc-mr1-dev-plus-aosp am:
aa3c463a5b"
Robert Sesek [Fri, 14 Oct 2016 18:40:38 +0000 (18:40 +0000)]
Merge "resolve merge conflicts of
0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am:
856a791ddd
Change-Id: Icb2198b97ee0d3deacab6a734361b2e10d7f3a30
Robert Sesek [Fri, 14 Oct 2016 18:40:34 +0000 (18:40 +0000)]
resolve merge conflicts of
0b58f19 to nyc-mr1-dev-plus-aosp
am:
aa3c463a5b
Change-Id: Ib213dc42ac82d6bf738e727d56794a3cd6b1a35d
Android Build Merger (Role) [Fri, 14 Oct 2016 18:40:10 +0000 (18:40 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
dc7280fe74 -s ours am:
44de8bed78 -s ours am:
2e98bb8d48 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:39:32 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
dc7280fe74 -s ours am:
44de8bed78 -s ours
am:
2e98bb8d48 -s ours
Change-Id: I4658636b5565b75cd0be0c67b3108dd08bf69665
Android Build Merger (Role) [Fri, 14 Oct 2016 18:39:14 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE am:
ade9e011a8 -s ours am:
40e8df7169 -s ours am:
c12a077bc9 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:38:22 +0000 (18:38 +0000)]
Import translations. DO NOT MERGE am:
ade9e011a8 -s ours am:
40e8df7169 -s ours
am:
c12a077bc9 -s ours
Change-Id: Iac2bd7d59c0d3e71005a17cbe5e294f1c33a307a
Android Build Merger (Role) [Fri, 14 Oct 2016 18:38:01 +0000 (18:38 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e3c1d48dc0 -s ours" into cw-f-dev am:
c4c7942ee2 -s ours am:
b01f5a835c -s ours"
Bill Yi [Fri, 14 Oct 2016 18:37:24 +0000 (18:37 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e3c1d48dc0 -s ours" into cw-f-dev am:
c4c7942ee2 -s ours
am:
b01f5a835c -s ours
Change-Id: I7a26698e8abf0e414c2ba59d2968c36c651b92f6
Android Build Merger (Role) [Fri, 14 Oct 2016 18:37:05 +0000 (18:37 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e3c1d48dc0 -s ours am:
fca9f14523 -s ours am:
f258beafa5 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:36:23 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e3c1d48dc0 -s ours am:
fca9f14523 -s ours
am:
f258beafa5 -s ours
Change-Id: I24005be8f0b93233d6aafec2c8d5cd6e981795e9
Android Build Merger (Role) [Fri, 14 Oct 2016 18:36:05 +0000 (18:36 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
cda884446e -s ours" into cw-f-dev am:
a96ca901cc -s ours am:
924c893884 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:35:28 +0000 (18:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
cda884446e -s ours" into cw-f-dev am:
a96ca901cc -s ours
am:
924c893884 -s ours
Change-Id: I24bd6a0ae85920124c0fd7b1697d450adcc22262
Android Build Merger (Role) [Fri, 14 Oct 2016 18:35:11 +0000 (18:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
cda884446e -s ours am:
a4999db816 -s ours am:
858d8e8452 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:34:29 +0000 (18:34 +0000)]
Import translations. DO NOT MERGE am:
cda884446e -s ours am:
a4999db816 -s ours
am:
858d8e8452 -s ours
Change-Id: Icf82dc792c501cbad17f658304af9e03398cc911
Android Build Merger (Role) [Fri, 14 Oct 2016 18:34:10 +0000 (18:34 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a2dabae9dd -s ours" into cw-f-dev am:
18593450fc -s ours am:
664a7ccaea -s ours"
Bill Yi [Fri, 14 Oct 2016 18:33:28 +0000 (18:33 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a2dabae9dd -s ours" into cw-f-dev am:
18593450fc -s ours
am:
664a7ccaea -s ours
Change-Id: I164c3d292a2a9c60c9977cd749e9b750415fea48
Android Build Merger (Role) [Fri, 14 Oct 2016 18:33:09 +0000 (18:33 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a2dabae9dd -s ours am:
8f1a1aace1 -s ours am:
2416e556e9 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:32:36 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a2dabae9dd -s ours am:
8f1a1aace1 -s ours
am:
2416e556e9 -s ours
Change-Id: I147b32d92f663c67f72c9816617edc2fb64947fd
Android Build Merger (Role) [Fri, 14 Oct 2016 18:32:19 +0000 (18:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
3e8a8c97bb -s ours" into cw-f-dev am:
3337a3ef87 -s ours am:
88efec3c6a -s ours"
Bill Yi [Fri, 14 Oct 2016 18:31:37 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE am:
3e8a8c97bb -s ours" into cw-f-dev am:
3337a3ef87 -s ours
am:
88efec3c6a -s ours
Change-Id: I1f2d63def06a2aabdf535434feeb9175a07eaaf0
Android Build Merger (Role) [Fri, 14 Oct 2016 18:31:17 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE am:
3e8a8c97bb -s ours am:
5dca6db3ba -s ours am:
38f17c86e6 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:30:35 +0000 (18:30 +0000)]
Import translations. DO NOT MERGE am:
3e8a8c97bb -s ours am:
5dca6db3ba -s ours
am:
38f17c86e6 -s ours
Change-Id: I10a4ec48e9fe2bdb542c0f3b2ffa3abadaa6948f
Android Build Merger (Role) [Fri, 14 Oct 2016 18:30:17 +0000 (18:30 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
73d6846d28 -s ours am:
64ae1be8a8 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:29:35 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
73d6846d28 -s ours
am:
64ae1be8a8 -s ours
Change-Id: I01824ff4b59fcfcde730b1f64c32fc4da72a8e17
Android Build Merger (Role) [Fri, 14 Oct 2016 18:29:17 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE am:
f32982dad6 -s ours am:
1eea89e79b -s ours"
Bill Yi [Fri, 14 Oct 2016 18:28:39 +0000 (18:28 +0000)]
Import translations. DO NOT MERGE am:
f32982dad6 -s ours
am:
1eea89e79b -s ours
Change-Id: I681edb0ba7f54ac4c55a4e64785c3cb8385d6067
Android Build Merger (Role) [Fri, 14 Oct 2016 18:28:19 +0000 (18:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
56f7606fa1 -s ours am:
cd4b06c390 -s ours"
Bill Yi [Fri, 14 Oct 2016 18:27:41 +0000 (18:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
56f7606fa1 -s ours
am:
cd4b06c390 -s ours
Change-Id: Ia7cb92eb9d38ca231e703d3fcaddc1d0daf35e14
Android Build Merger (Role) [Fri, 14 Oct 2016 18:27:22 +0000 (18:27 +0000)]
Merge "Import translations. DO NOT MERGE am:
9396a20e3f -s ours am:
6fc371149e -s ours"
Bill Yi [Fri, 14 Oct 2016 18:26:30 +0000 (18:26 +0000)]
Import translations. DO NOT MERGE am:
9396a20e3f -s ours
am:
6fc371149e -s ours
Change-Id: I54e129b8efa06b96e61db4782e660f75d7a84efa
Android Build Merger (Role) [Fri, 14 Oct 2016 18:26:13 +0000 (18:26 +0000)]
Merge "Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev am:
8a032b98fe am:
97944c00fe am:
9a5570f5bc -s ours"
Garfield Tan [Fri, 14 Oct 2016 18:25:27 +0000 (18:25 +0000)]
Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev am:
8a032b98fe am:
97944c00fe
am:
9a5570f5bc -s ours
Change-Id: I8bd9b519216172d3ee61dc44ed648b588d64116e
Android Build Merger (Role) [Fri, 14 Oct 2016 18:25:00 +0000 (18:25 +0000)]
Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. am:
d91dd17f36 am:
cc6a8b5190 am:
706530bd88 -s ours"
Jerry Zhang [Fri, 14 Oct 2016 18:24:32 +0000 (18:24 +0000)]
Merge changes from topic 'usb_bugfixes'
* changes:
Automatically turn on adb for userdebug and eng builds.
Fixed handling of usb state during adb changes.
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
Remove the kick from config switches in UsbDeviceManager
Garfield Tan [Fri, 14 Oct 2016 18:24:22 +0000 (18:24 +0000)]
DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. am:
d91dd17f36 am:
cc6a8b5190
am:
706530bd88 -s ours
Change-Id: I27e4846c35134362404b0ae64a36461c36b9ad5e
Ben Lin [Fri, 14 Oct 2016 18:23:27 +0000 (18:23 +0000)]
Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev am:
c8358bfe65 am:
642941d629
am:
27c9ff263b
Change-Id: I9610df5d292d10f5777458a5cfc51a8d49297375
Ben Lin [Fri, 14 Oct 2016 18:22:19 +0000 (18:22 +0000)]
Removing a mimeIcon specific for album folders from MediaProvider. am:
6d33357882 am:
f3b7acecc7
am:
54875dd37a -s ours
Change-Id: Ia106d6a732908e36ef8fc72917645fde9de27410
Wale Ogunwale [Wed, 12 Oct 2016 21:55:56 +0000 (14:55 -0700)]
Fixed issue with IME window not been added to its window token
This looks like a coding error that has always existed. The window
was added to the display window list, but not to its window token.
The issue was exposed by the switch to using the window container
hierarchy since the window was not a child of the token it wasn't
showing up in the hierarchy.
Test: Run 'adb shell dumpsys window containers' and make use the
InputMethod window shows up in the print-out.
Change-Id: I43cb5d6b3f266c1be54dd27def4c13e1ef98a4fa
TreeHugger Robot [Fri, 14 Oct 2016 17:58:03 +0000 (17:58 +0000)]
Merge "Added non-app window tokens to window container hierarchy"
Joe Onorato [Fri, 14 Oct 2016 17:41:07 +0000 (17:41 +0000)]
Merge "Add android.util.proto package as an @TestApi."
Marco Nelissen [Thu, 13 Oct 2016 21:38:40 +0000 (14:38 -0700)]
Make AmrInputStream use MediaCodec
Bug:
32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
Sungsoo [Fri, 14 Oct 2016 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f am:
30404396be am:
d7475b491d -s ours am:
3069b72d76
am:
20b502a6b1
Change-Id: I0aab1a7164cc1ae0e5bb326b5e3a16f4f82811ac
Sungsoo [Fri, 14 Oct 2016 14:36:06 +0000 (14:36 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded am:
d3f3729a17 am:
9d675aadf1 -s ours am:
3ab3eff7c1
am:
b25d26c40c
Change-Id: I2d61ebdd72d9734bd028050f5378daa702509173
Sungsoo [Fri, 14 Oct 2016 14:35:13 +0000 (14:35 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1 am:
7bb855a973 am:
68469a695e -s ours am:
b4fdad2b8c
am:
93b3e8e606
Change-Id: Ia5364aa347ecbc8365078fca55151d00d2b874c8
Sungsoo [Fri, 14 Oct 2016 14:34:17 +0000 (14:34 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca am:
016c5889bc am:
d6508621fc -s ours am:
b576f816c5
am:
315b8b7bbc
Change-Id: I77c388c612abb7e315a7aacc6de51b2648716421
Sungsoo Lim [Fri, 14 Oct 2016 14:33:20 +0000 (14:33 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e
am:
013d3a4964
Change-Id: I5b57c744a880b595c3502491d41957832f3ee520
Sungsoo [Fri, 14 Oct 2016 14:32:31 +0000 (14:32 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801
am:
6e01f028ab
Change-Id: Ibda28727ab8de7c7576e46dba411d9ba334ab1a4
Svetoslav Ganov [Fri, 14 Oct 2016 14:31:42 +0000 (14:31 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" am:
c98b34bdce am:
72510e6244
am:
cf146edb32
Change-Id: Icb456bac6bf5bf357848d73356adbd8772c37817
Bert McMeen [Fri, 14 Oct 2016 14:30:44 +0000 (14:30 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e
am:
4c5141b98b
Change-Id: I5a819483cb7acab434c81442dee13ee3c80f9e28
Yuta Yamada [Fri, 14 Oct 2016 14:29:58 +0000 (14:29 +0000)]
Merge "Fix memory leak of Dnd tile" am:
6057a8360a am:
465397e28e
am:
be3b53beca
Change-Id: I12dae89a0b577379e7a868182b535f5dcda09d36
Selim Cinek [Fri, 14 Oct 2016 14:29:03 +0000 (14:29 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am:
6f3a05ae77 -s ours am:
20307881d7 -s ours
am:
e58f1e5965
Change-Id: I483d2f52d347d2fb0064a6f9a0e6db3d5a61aa67
Selim Cinek [Fri, 14 Oct 2016 14:28:12 +0000 (14:28 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string" am:
d33e79c328 -s ours am:
cb654a5fbd -s ours
am:
8bd7df4536
Change-Id: I89a5d36d40cd1b1973f99406905bafc20ba1c8dc
Robert Greenwalt [Fri, 14 Oct 2016 14:27:22 +0000 (14:27 +0000)]
Merge "Add free short codes for direct carrier billing and others" am:
73c50f7dbc am:
6f8c54a16d
am:
2b06e19f2d
Change-Id: I50e107a8dc433cdc563ad6663ec5feef8e992fc2
Shinji Sogo [Fri, 14 Oct 2016 14:26:32 +0000 (14:26 +0000)]
Merge "Don't compare FQDN with providerFriendlyName" am:
aae64557e1 am:
9c84160545
am:
b8bab1df10
Change-Id: Ic019a0f04737d128cc5005be8fe9733f30ee44a3
Adam Lesinski [Fri, 14 Oct 2016 14:25:39 +0000 (14:25 +0000)]
Merge "RRO: Synchronize access to overlays.list" am:
78382db820 am:
1b9303e8f0
am:
c68597e671
Change-Id: I067a006032a73d646f779669db9dcf6a25020709
Jorim Jaggi [Fri, 14 Oct 2016 14:24:48 +0000 (14:24 +0000)]
Merge "Fix split-screen flash issue" am:
6738617652 am:
f1fed4de21
am:
4e7407a80e
Change-Id: Ibfef3bd01a54cca64a2f0de197bd9480a7539cd0
Rebecca Silberstein [Fri, 14 Oct 2016 14:23:56 +0000 (14:23 +0000)]
Merge "Tethering: check if configManager is null" am:
e011bf80c5 am:
d1e4dbf002
am:
d33a0ee710
Change-Id: I2d8cfac1093b6973b2b5f06e2ba37cff9866d82a
Brad Ebinger [Fri, 14 Oct 2016 14:22:38 +0000 (14:22 +0000)]
Merge "Transplant the Logging system from Telecom" am:
cbb03d1ad3 am:
951dca8209
am:
0ab9a078e9
Change-Id: I79e6b2de4bf523036ed1d15debd142a1786249c5
Christopher Wiley [Fri, 14 Oct 2016 14:21:39 +0000 (14:21 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats" am:
6408e2e5cc am:
eedd2b529d
am:
53d12379f4
Change-Id: I4bcde8dde8c3bad7754e26dd56f8321032daa5a3
John Reck [Fri, 14 Oct 2016 14:20:42 +0000 (14:20 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs" am:
2dc11c0500 am:
ee3adf6d91
am:
f136fa872f
Change-Id: Ifd944500fb75bdefa30e0f083e26b0de2cc1cb3a
Andre Eisenbach [Fri, 14 Oct 2016 14:19:49 +0000 (14:19 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am:
5c043f51b0 am:
3c3329bd34
am:
d6a85bdea3
Change-Id: Id01a44e2424cb71b7ab89592d84de272b25ae0fe
Andreas Gampe [Fri, 14 Oct 2016 14:18:58 +0000 (14:18 +0000)]
Merge "Debug: Use UniqueFile" am:
546f755bf8 am:
8d151b26c2
am:
77a2f22f77
Change-Id: Ib904c45f715b742f3cd78c54c9bddbda1dc0946b
Wale Ogunwale [Fri, 14 Oct 2016 14:18:22 +0000 (07:18 -0700)]
Fix build breakage.
Test: Build builds.
Change-Id: Ia7f8fc7331bb9bf34756606a0f2cb2ce223db574
Selim Cinek [Fri, 14 Oct 2016 14:17:58 +0000 (14:17 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature" am:
a0322d5c5a -s ours am:
00c553e1ba -s ours
am:
8f681f7220
Change-Id: Ic3fe3a5021097097a3b818040e046de1e9011941
lei.peng [Fri, 14 Oct 2016 14:17:07 +0000 (14:17 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am:
80587da3c1 am:
93c75d07c1
am:
d975003af3
Change-Id: If4ff1ee251842598f1a5e8dedb7858daed201206
Stephen Li [Fri, 14 Oct 2016 14:16:15 +0000 (14:16 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master am:
6accb573ab
am:
7cbe133507
Change-Id: I7f1aa17fecc22655a80ddc993786fa77039fa71b
OSDN Git Service
