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

Tianjie Xu [Wed, 28 Sep 2016 20:05:15 +0000 (20:05 +0000)]

Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708
am: 3aeade44a9

Change-Id: I913474dbf87b30683267d8f6a458927b7d331c4c

commit | commitdiff | tree

Tianjie Xu [Wed, 28 Sep 2016 19:59:12 +0000 (19:59 +0000)]

Merge "Log the error when uncrypt timeouts" am: c1973ecbd2
am: c68e6d6708

Change-Id: I23ee644fb2f73fc3cece4faf59eb63417cfe3ea6

commit | commitdiff | tree

Tianjie Xu [Wed, 28 Sep 2016 19:53:37 +0000 (19:53 +0000)]

Merge "Log the error when uncrypt timeouts"
am: c1973ecbd2

Change-Id: I5bec3110f9a46cbc1f44bc07d86eea409667983e

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 19:42:29 +0000 (19:42 +0000)]

Merge "Log the error when uncrypt timeouts"

commit | commitdiff | tree

Vadim Tryshev [Wed, 28 Sep 2016 19:20:00 +0000 (19:20 +0000)]

Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev am: e7809891f7
am: 0450961e1f

Change-Id: I0bd6859142918a229f727ae70d4a25b5bd755336

commit | commitdiff | tree

Vadim Tryshev [Wed, 28 Sep 2016 19:19:10 +0000 (19:19 +0000)]

Fixing html glitch in drag/drop docs. am: aed92d0547
am: 0f03709e14

Change-Id: I898d398de7a772c6ada8dd8ee6c702d99d144775

commit | commitdiff | tree

Vadim Tryshev [Wed, 28 Sep 2016 19:14:07 +0000 (19:14 +0000)]

Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev
am: e7809891f7

Change-Id: I60e7db358928737faa427202a137bd036598bc61

commit | commitdiff | tree

Vadim Tryshev [Wed, 28 Sep 2016 19:14:05 +0000 (19:14 +0000)]

Fixing html glitch in drag/drop docs.
am: aed92d0547

Change-Id: I9fe6a7b9544bef4fe4f3ef03f39a3dd59d5cd7ac

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Sep 2016 19:07:16 +0000 (19:07 +0000)]

Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev

commit | commitdiff | tree

Neil Fuller [Wed, 28 Sep 2016 18:02:04 +0000 (18:02 +0000)]

Merge "Rerun of update-api with no changes" am: f0aa998233 am: 9c0412b7ca
am: 6b32f3801f

Change-Id: I54659875aee7e989caf4adcef47817f1e0a43ebe

commit | commitdiff | tree

Neil Fuller [Wed, 28 Sep 2016 17:55:30 +0000 (17:55 +0000)]

Merge "Rerun of update-api with no changes" am: f0aa998233
am: 9c0412b7ca

Change-Id: Icb3cd23aed57e3d0c2191f65d9d2298c5b4df006

commit | commitdiff | tree

Neil Fuller [Wed, 28 Sep 2016 17:50:44 +0000 (17:50 +0000)]

Merge "Rerun of update-api with no changes"
am: f0aa998233

Change-Id: I23a36931c027b29f740879e46d1c28e53b616d71

commit | commitdiff | tree

Andreas Huber [Wed, 28 Sep 2016 17:42:02 +0000 (17:42 +0000)]

Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac am: 2849ee8b75
am: 0f7eb16fad

Change-Id: I43c563eaba14573e94ced381791eb6ba787d3e51

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 17:41:53 +0000 (17:41 +0000)]

Merge "Rerun of update-api with no changes"

commit | commitdiff | tree

Andreas Huber [Wed, 28 Sep 2016 17:36:31 +0000 (17:36 +0000)]

Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac
am: 2849ee8b75

Change-Id: I00d47819095dd8b52dae52f3d55d6b3bc9998aaf

commit | commitdiff | tree

Andreas Huber [Wed, 28 Sep 2016 17:30:23 +0000 (17:30 +0000)]

Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"
am: 90acbd86ac

Change-Id: Ia3013237296ccca46e3f4e0bc702b4ae90a7ea3a

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 17:16:52 +0000 (17:16 +0000)]

Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"

commit | commitdiff | tree

ryang [Wed, 28 Sep 2016 17:10:58 +0000 (17:10 +0000)]

Merge "hwui: Fix the length of partial updates system property" am: faf945a773 am: 73f2e9b812
am: 3734e98095

Change-Id: I88c1092a7fcce45d80bb2f5cd7d14b25e0660f40

commit | commitdiff | tree

ryang [Wed, 28 Sep 2016 17:04:26 +0000 (17:04 +0000)]

Merge "hwui: Fix the length of partial updates system property" am: faf945a773
am: 73f2e9b812

Change-Id: Ibcc55a59fd29614e491843a0dbbcfd316f423312

commit | commitdiff | tree

ryang [Wed, 28 Sep 2016 16:58:57 +0000 (16:58 +0000)]

Merge "hwui: Fix the length of partial updates system property"
am: faf945a773

Change-Id: I2f98f29446c9a303e72f0ff6a3ddd2612e369c0a

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 16:47:02 +0000 (16:47 +0000)]

Merge "hwui: Fix the length of partial updates system property"

commit | commitdiff | tree

yuanhuihui [Wed, 28 Sep 2016 16:41:56 +0000 (16:41 +0000)]

Merge "fix persistent process is killed and restart again and again" am: ae302cef52 am: b322dc384e
am: 20a5fe414e

Change-Id: I9a454463a8881dded9b3d7905d4cf76223b4acd4

commit | commitdiff | tree

yuanhuihui [Wed, 28 Sep 2016 16:36:47 +0000 (16:36 +0000)]

Merge "fix persistent process is killed and restart again and again" am: ae302cef52
am: b322dc384e

Change-Id: Ie1802af0a6f22cb69c3b62f0912363a299f8f453

commit | commitdiff | tree

yuanhuihui [Wed, 28 Sep 2016 16:30:25 +0000 (16:30 +0000)]

Merge "fix persistent process is killed and restart again and again"
am: ae302cef52

Change-Id: I31ead1fe09561e69df0cd94f366b2ef4648b29f3

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 16:20:55 +0000 (16:20 +0000)]

Merge "fix persistent process is killed and restart again and again"

commit | commitdiff | tree

Erik Kline [Wed, 28 Sep 2016 15:59:14 +0000 (15:59 +0000)]

Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev am: 0f53f6ffa2
am: 42202aa881

Change-Id: I3509b5f1e1536eaa727ae023d7b0af0e623ab49f

commit | commitdiff | tree

Erik Kline [Wed, 28 Sep 2016 15:57:55 +0000 (15:57 +0000)]

Support triggering confirmConfiguration() via dumpsys am: c3eec4fff9
am: eb250f0db1

Change-Id: I16d9617f7f2cb412095801f4e1ccbc34b11a2fbf

commit | commitdiff | tree

Erik Kline [Wed, 28 Sep 2016 15:52:49 +0000 (15:52 +0000)]

Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev
am: 0f53f6ffa2

Change-Id: Ie537f57ef151f67f8bd2f98ee7463ce95938d1c0

commit | commitdiff | tree

Erik Kline [Wed, 28 Sep 2016 15:52:47 +0000 (15:52 +0000)]

Support triggering confirmConfiguration() via dumpsys
am: c3eec4fff9

Change-Id: I0b54ab6c028308e676c3f6380019c8aff809fe70

commit | commitdiff | tree

Neil Fuller [Wed, 28 Sep 2016 15:51:03 +0000 (16:51 +0100)]

Rerun of update-api with no changes

Picks up a small change to Parameter.

Looks like it was caused by a mid-air collision between
commit 3ead539c0129e6dd82df301e2652f1c0524a3b82, which
introduced Parameter, and commit
b4fcc6136e25d46af460d4cb99b8f5f279bfb5db which
introduced improvements to generics in the .txt file.

Test: make droid
Change-Id: If1c11e9303d17854ab1e5559c9a412cc6de54685

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Sep 2016 15:46:30 +0000 (15:46 +0000)]

Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev

commit | commitdiff | tree

Jeremy Klein [Wed, 28 Sep 2016 15:44:23 +0000 (15:44 +0000)]

Remove unused mContext from BluetoothGatt[Server]. am: adc26ec1b4
am: 140e5cce70

Change-Id: I11c459514e54bb486f3a90a1b0390453fc48b857

commit | commitdiff | tree

Jeremy Klein [Wed, 28 Sep 2016 15:38:46 +0000 (15:38 +0000)]

Remove unused mContext from BluetoothGatt[Server].
am: adc26ec1b4

Change-Id: Ic6650d0b5de52b8c4662fb5a103a9ff2c9194d42

commit | commitdiff | tree

Jakub Adamek [Wed, 28 Sep 2016 10:27:46 +0000 (10:27 +0000)]

Merge "Search for runtime resource overlays in subdir." into cw-f-dev
am: 8bb793394d

Change-Id: I00e3f842d0306c1d40e341a7624a6cf05ef4fbd6

commit | commitdiff | tree

Jakub Adamek [Wed, 28 Sep 2016 10:27:41 +0000 (10:27 +0000)]

Search for runtime resource overlays in subdir.
am: 1c15c63578

Change-Id: Ie6614c07851a2365b623a455b2ccc85672d4c846

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Sep 2016 10:19:24 +0000 (10:19 +0000)]

Merge "Search for runtime resource overlays in subdir." into cw-f-dev

commit | commitdiff | tree

Jakub Adamek [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]

Search for runtime resource overlays in subdir.

See go/sku-colors. This changes the directory to search for framework
overlays if the right system property is defined. This allows
OEMs to specify different resources based on device SKUs.

Bug: 31692079
Change-Id: I9cb121b286b7f52aa26de1757fde1f3110cd47fd

commit | commitdiff | tree

Jeremy Klein [Tue, 27 Sep 2016 21:34:33 +0000 (14:34 -0700)]

Remove unused mContext from BluetoothGatt[Server].

All that this member variable is doing right now is leaking a
reference to a context without any benefit.

Bug: 31752040
Bug: 31710795
Change-Id: If2241422533318b866340e8dcc9f5fbd9518349c

commit | commitdiff | tree

Erik Kline [Wed, 28 Sep 2016 06:19:00 +0000 (15:19 +0900)]

Support triggering confirmConfiguration() via dumpsys

Tested:
  - flashed to device
  - triggered
  - monitored tcpdump for the expected traffic

Bug: 30869013
Change-Id: I6a4741bdeed2aaa483f8c2281acb74d245a323e8

commit | commitdiff | tree

Etan Cohen [Wed, 28 Sep 2016 05:25:52 +0000 (05:25 +0000)]

Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e am: 66741c2c0f
am: a96c6e222b

Change-Id: I2bb9a0eb5040d0dd37ec2ffda5fa06bde9ee6a50

commit | commitdiff | tree

Etan Cohen [Wed, 28 Sep 2016 05:20:02 +0000 (05:20 +0000)]

Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e
am: 66741c2c0f

Change-Id: I5cef0e013ff9ca49216cc1e6c8208353f2d063f4

commit | commitdiff | tree

Etan Cohen [Wed, 28 Sep 2016 05:14:30 +0000 (05:14 +0000)]

Merge "[NAN] Use a hidden class for peer ID opaque handle"
am: e43c1a3e3e

Change-Id: Iac94c4b27f7bfc89c1b1f7779760512ee2a11e31

commit | commitdiff | tree

Etan Cohen [Wed, 28 Sep 2016 05:04:06 +0000 (05:04 +0000)]

Merge "[NAN] Use a hidden class for peer ID opaque handle"

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:59:05 +0000 (03:59 +0000)]

Merge changes from topic 'libandroid-ndk_headers' am: 00a19a37db am: c2c9caa71e
am: ca68d73d58

Change-Id: I25c030fa891ebd199c68128457722a33cf2967fd

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:53:56 +0000 (03:53 +0000)]

Move libjnigraphics to ndk_library. am: 7ce8df32a7 am: 15ccfb32ff
am: 60156b8573

Change-Id: I00fdcf5d9debde5d3467a5b7346b70a38cc03541

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:53:40 +0000 (03:53 +0000)]

Merge changes from topic 'libandroid-ndk_headers' am: 00a19a37db
am: c2c9caa71e

Change-Id: I4f7b74ab00e0c04da23874c4816a167abd0bd70e

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:53:08 +0000 (03:53 +0000)]

Migrate libandroid.so to ndk_library. am: 2a8d9c20bd am: e7ee5cd043
am: b4720e6de2

Change-Id: I033be52422d53af716523b18f8a76a9d15a65e28

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:48:17 +0000 (03:48 +0000)]

Merge changes from topic 'libandroid-ndk_headers'
am: 00a19a37db

Change-Id: I0cabe907b999e5ea14ec1ff3cebb739b99b6a764

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:45:03 +0000 (03:45 +0000)]

Move libjnigraphics to ndk_library. am: 7ce8df32a7
am: 15ccfb32ff

Change-Id: Ib32e5f1ecc49fa2cc98f7208f811d405a6e78eb3

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:44:04 +0000 (03:44 +0000)]

Migrate libandroid.so to ndk_library. am: 2a8d9c20bd
am: e7ee5cd043

Change-Id: Id991d13c769e77951ca238126aaa09a3e1576b86

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:39:23 +0000 (03:39 +0000)]

Move libjnigraphics to ndk_library.
am: 7ce8df32a7

Change-Id: I1eb9e19b6a270a9b24bdff9a5a86a06a1a8d197f

commit | commitdiff | tree

Dan Albert [Wed, 28 Sep 2016 03:38:22 +0000 (03:38 +0000)]

Migrate libandroid.so to ndk_library.
am: 2a8d9c20bd

Change-Id: Iaa9b5929b542307e5c95f1e7fe1d4d275189e683

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 03:32:56 +0000 (03:32 +0000)]

Merge changes from topic 'libandroid-ndk_headers'

* changes:
Move libjnigraphics to ndk_library.
Migrate libandroid.so to ndk_library.

commit | commitdiff | tree

Sungsoo [Wed, 28 Sep 2016 00:35:22 +0000 (00:35 +0000)]

ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034 am: 0a31d58d14 am: 4e236046ae
am: 1bb6822cd0

Change-Id: Iba5b443d2dd510f389c6b1948d550a0ba5d72e89

commit | commitdiff | tree

Sungsoo [Wed, 28 Sep 2016 00:28:19 +0000 (00:28 +0000)]

ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034 am: 0a31d58d14
am: 4e236046ae

Change-Id: Ia180fcbaaf1083c11c29188cbf1aae1c0e9c6886

commit | commitdiff | tree

Sungsoo [Wed, 28 Sep 2016 00:22:55 +0000 (00:22 +0000)]

ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
am: 0a31d58d14

Change-Id: I33726dd0a1bf2f30309e4abd74b8633c809afada

commit | commitdiff | tree

Sungsoo [Wed, 28 Sep 2016 00:22:53 +0000 (00:22 +0000)]

ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
am: 6e8eba7238

Change-Id: Ifffb86693778c77a57b2a22387495c0d6cbd1e12

commit | commitdiff | tree

Sungsoo [Wed, 28 Sep 2016 00:18:44 +0000 (00:18 +0000)]

ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
am: d0a8a69034

Change-Id: I1d3369e609d668dc402d4b30eb0c4247980e6e47

commit | commitdiff | tree

Salvador Martinez [Wed, 28 Sep 2016 00:17:47 +0000 (00:17 +0000)]

Merge "Changed themes for core activities" into nyc-mr1-dev am: c43f05e669
am: d7772a562c

Change-Id: I8df79a7226792d09e1fa7b1dd19acc3c5865a6b4

commit | commitdiff | tree

Vadim Tryshev [Wed, 28 Sep 2016 00:17:07 +0000 (17:17 -0700)]

Fixing html glitch in drag/drop docs.

Bug: 31702571
Change-Id: Id00baac3c9c16f6dc7145a920ec9659d63ebab2a

commit | commitdiff | tree

Salvador Martinez [Wed, 28 Sep 2016 00:16:50 +0000 (00:16 +0000)]

Changed themes for core activities am: 7e2657c303
am: f3209d6c87

Change-Id: I1595ffd9a91137666e45792f8f980355ea622f50

commit | commitdiff | tree

Sungsoo [Wed, 28 Sep 2016 00:15:51 +0000 (00:15 +0000)]

ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
am: d0a8a69034

Change-Id: I4df5b4855ec9f1e38fab504f3a895c4744cc287e

commit | commitdiff | tree

Salvador Martinez [Wed, 28 Sep 2016 00:08:58 +0000 (00:08 +0000)]

Merge "Changed themes for core activities" into nyc-mr1-dev
am: c43f05e669

Change-Id: I4cda794530cd0abe6b00aed72bb6f7e6eb258f42

commit | commitdiff | tree

Salvador Martinez [Wed, 28 Sep 2016 00:08:55 +0000 (00:08 +0000)]

Changed themes for core activities
am: 7e2657c303

Change-Id: If4019d7f37ea13bbbcbaeaaccde40a112173683c

commit | commitdiff | tree

Sungsoo [Wed, 28 Sep 2016 00:08:52 +0000 (00:08 +0000)]

ExifInterface: Update javadoc for saveAttributes
am: abf5b4cbf3

Change-Id: Icdd289f513f2a576b50d0f3ddf278a1c1710d8b5

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Sep 2016 00:03:58 +0000 (00:03 +0000)]

Merge "Changed themes for core activities" into nyc-mr1-dev

commit | commitdiff | tree

Greg Kaiser [Tue, 27 Sep 2016 23:55:28 +0000 (23:55 +0000)]

Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev am: a97c9617ae
am: 43e4df0517

Change-Id: I2182d8d1a82d1fa729d1251df2d88ec6f9eaa5be

commit | commitdiff | tree

Greg Kaiser [Tue, 27 Sep 2016 23:54:37 +0000 (23:54 +0000)]

ContextHubService: Hack around 32-bit app ID am: 1983f9b05b
am: 40c0435026

Change-Id: Ie8594f39ea791fc1beaed1bff9274526d98338dc

commit | commitdiff | tree

Christopher Tate [Tue, 27 Sep 2016 23:53:43 +0000 (23:53 +0000)]

Merge "Don't leak wakelock instances" into nyc-mr1-dev am: 121a9941d4
am: f411051195

Change-Id: I006e62e81156ba31dc245fee9bcfbea43edd71b0

commit | commitdiff | tree

Christopher Tate [Tue, 27 Sep 2016 23:50:20 +0000 (23:50 +0000)]

Don't leak wakelock instances am: 4b17e984b6
am: cea6cc9d33

Change-Id: I908ad297251b1abd8b8502059a53363cf3be9af2

commit | commitdiff | tree

Greg Kaiser [Tue, 27 Sep 2016 23:46:11 +0000 (23:46 +0000)]

Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev
am: a97c9617ae

Change-Id: I9dbfb6b90c90f37c744632c4fa22417f4c1de3d0

commit | commitdiff | tree

Greg Kaiser [Tue, 27 Sep 2016 23:46:08 +0000 (23:46 +0000)]

ContextHubService: Hack around 32-bit app ID
am: 1983f9b05b

Change-Id: I9b87a8f35d2f97dcea4bbd73fd2783e1ece26d33

commit | commitdiff | tree

Christopher Tate [Tue, 27 Sep 2016 23:44:53 +0000 (23:44 +0000)]

Merge "Don't leak wakelock instances" into nyc-mr1-dev
am: 121a9941d4

Change-Id: I64c849823281500fc8b9ecf760e162d1a2a92d65

commit | commitdiff | tree

Christopher Tate [Tue, 27 Sep 2016 23:44:51 +0000 (23:44 +0000)]

Don't leak wakelock instances
am: 4b17e984b6

Change-Id: I952939e1d7e7b7f3ddfff7ecdfb7f3ca70bd9b70

commit | commitdiff | tree

Etan Cohen [Tue, 27 Sep 2016 16:15:46 +0000 (09:15 -0700)]

[NAN] Use a hidden class for peer ID opaque handle

Results in clearer run-time exception (relatively to using Integer).

(cherry-pick of commit 57db2b3eea5333e5ee144ea29e4a4af02fae7309)

Bug: 31689166
Test: unit-tests + integrated (sl4a).
Change-Id: I79d0e8061204834b9775b02d503cb18fd03ed8c6

commit | commitdiff | tree

Greg Kaiser [Tue, 27 Sep 2016 23:41:42 +0000 (23:41 +0000)]

Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 27 Sep 2016 23:37:53 +0000 (23:37 +0000)]

Merge "Don't leak wakelock instances" into nyc-mr1-dev

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 23:13:10 +0000 (23:13 +0000)]

Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f am: 6789896f2d am: 97c0ad4401
am: 3e440ed80e

Change-Id: I6f98de2d059b0545f2b3597984b1eb9bfc786150

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 23:12:17 +0000 (23:12 +0000)]

docs: Removed support libraries from API Guide TOC am: 61f956cc25 am: 06c6d90437 am: 34c0653b22
am: 10951aa8e9

Change-Id: I2cfe604de0078d90b46d041021d2e3c10070aa37

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 23:08:38 +0000 (23:08 +0000)]

Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f am: 6789896f2d
am: 97c0ad4401

Change-Id: I77c51b55e4ed664552bb38b6a0fb34500b7cc52f

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 23:07:43 +0000 (23:07 +0000)]

docs: Removed support libraries from API Guide TOC am: 61f956cc25 am: 06c6d90437
am: 34c0653b22

Change-Id: I930020a2ac3e4ad59ee98d98fe2b60e51f28fd82

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 23:03:14 +0000 (23:03 +0000)]

Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f
am: 2ab0ae4eb6

Change-Id: Ied1e0b827ce66182e06b66b1e65d0a28d6e0e7c8

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 23:03:09 +0000 (23:03 +0000)]

Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f
am: 6789896f2d

Change-Id: I9f87882ff67784285225db361e24739ed3b5d509

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 23:02:17 +0000 (23:02 +0000)]

docs: Removed support libraries from API Guide TOC am: 61f956cc25
am: 06c6d90437

Change-Id: Ie6d17de7ecd7f3a41814afb391d61be1a265f962

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 23:02:16 +0000 (23:02 +0000)]

docs: Removed support libraries from API Guide TOC am: 61f956cc25
am: c390412350

Change-Id: Ibafb56af9f0f48528abca5898eed72a6a16f06d7

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 22:58:00 +0000 (22:58 +0000)]

Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev
am: c7c7c20b2f

Change-Id: I895fd121618cd78c7b46ba2eb047294179b4a4bc

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 22:57:56 +0000 (22:57 +0000)]

docs: Removed support libraries from API Guide TOC
am: 61f956cc25

Change-Id: Ie6bb20af4af2370ef820613b92e9c6053d761ad2

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 22:57:52 +0000 (22:57 +0000)]

Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev
am: c7c7c20b2f

Change-Id: I2e081c2183087e25f1c722ab4717a89da84bd9dd

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 22:57:49 +0000 (22:57 +0000)]

docs: Removed support libraries from API Guide TOC
am: 61f956cc25

Change-Id: I1d8ccea474531a3ce4dcaa7d261f3cff62cf4302

commit | commitdiff | tree

Andrew Solovay [Tue, 27 Sep 2016 22:52:28 +0000 (22:52 +0000)]

Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev

commit | commitdiff | tree

Jordan Liu [Tue, 27 Sep 2016 22:34:16 +0000 (22:34 +0000)]

Merge "Add key to CarrierConfig" am: 154c22d2d4 am: fda7370ddd
am: cf99a8e2e9

Change-Id: I2eb06df15a6605e8e688de470a0cd926e9989979

commit | commitdiff | tree

Jordan Liu [Tue, 27 Sep 2016 22:28:48 +0000 (22:28 +0000)]

Merge "Add key to CarrierConfig" am: 154c22d2d4
am: fda7370ddd

Change-Id: I7b33003443e9f9bf173f6ec7e3942bed2c6714a5

commit | commitdiff | tree

Jordan Liu [Tue, 27 Sep 2016 22:24:23 +0000 (22:24 +0000)]

Merge "Add key to CarrierConfig"
am: 154c22d2d4

Change-Id: I5355f13efb084c0785bcce60ef327dc4bc436fe2

commit | commitdiff | tree

Jordan Liu [Tue, 27 Sep 2016 22:19:26 +0000 (22:19 +0000)]

Merge "Add key to CarrierConfig"

commit | commitdiff | tree

Eric Schmidt [Tue, 27 Sep 2016 22:12:55 +0000 (22:12 +0000)]

Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev am: d780260f10 am: 6c7544b97a am: d5aa6361d9
am: 24b5c94154

Change-Id: I7c336b7230058aae727db0dd3a5045624a157421

commit | commitdiff | tree

Eric Schmidt [Tue, 27 Sep 2016 22:12:02 +0000 (22:12 +0000)]

docs: Update BroadcastReceiver docs for performance am: 8cf3c1b532 am: defb8bdaea am: 561a946aa8
am: 71b54e6737

Change-Id: I30a47031fae06cbb9ce85dc497e4bcdd663edada

commit | commitdiff | tree

Eric Schmidt [Tue, 27 Sep 2016 22:11:11 +0000 (22:11 +0000)]

Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev am: f4dbb4091b am: 168ea4e12c am: 03a34bc741
am: 8da1535ccd

Change-Id: I7f96d090c028ec3b53d0a58c0d2cd5b63a30225a

commit | commitdiff | tree

Eric Schmidt [Tue, 27 Sep 2016 22:10:17 +0000 (22:10 +0000)]

docs: Adding Espresso Intent and Web docs am: 34fb906c1a am: 0bb23eecef am: e8100dbfd9
am: 6be5b8abf3

Change-Id: I3f08bf139c52573ad1aea5b767d4b12b1cec38f7

commit | commitdiff | tree

Eric Schmidt [Tue, 27 Sep 2016 22:05:04 +0000 (22:05 +0000)]

Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev am: d780260f10 am: 6c7544b97a
am: d5aa6361d9

Change-Id: I80cb5816569d183e5e0cbe35f79bb07484844bf6

commit | commitdiff | tree

Eric Schmidt [Tue, 27 Sep 2016 22:04:18 +0000 (22:04 +0000)]

docs: Update BroadcastReceiver docs for performance am: 8cf3c1b532 am: defb8bdaea
am: 561a946aa8

Change-Id: Ic4c16d4ee51b666cea951f2a6c04256b2d120d2e