Jim Miller
|
3dcd1fc42e
|
Merge \\"Enable fingerprint nav by default\\" into nyc-mr1-dev am: 1ac356280c
am: c4f7a60765
Change-Id: I56bc077248e6b08ea4a1b5aa384dbb063f67c9f5
|
2016-06-21 02:02:46 +00:00 |
|
Jim Miller
|
c4f7a60765
|
Merge \"Enable fingerprint nav by default\" into nyc-mr1-dev
am: 1ac356280c
Change-Id: Id6df513225b539497309783c3d4f11745a147684
|
2016-06-21 01:58:03 +00:00 |
|
TreeHugger Robot
|
1ac356280c
|
Merge "Enable fingerprint nav by default" into nyc-mr1-dev
|
2016-06-21 01:51:59 +00:00 |
|
TreeHugger Robot
|
92baab4f2a
|
Merge "Make print via cloud confirm diag fragment public"
|
2016-06-21 00:29:03 +00:00 |
|
Sergei Vasilinetc
|
0e7b11f829
|
Merge "HWUI: move microbench to APCT infrastructure"
|
2016-06-21 00:16:36 +00:00 |
|
Sungsoo Lim
|
184f2e251e
|
Merge "MediaBrowserService: Fix ConcurrentModificationException"
|
2016-06-20 23:56:14 +00:00 |
|
TreeHugger Robot
|
caedd1b555
|
Merge "Moving Menu-related logic from BaseActivity to MenuManager."
|
2016-06-20 23:55:14 +00:00 |
|
Wale Ogunwale
|
c70323ac00
|
Merge \"Merge \\\"Don\\\'t re-launch stopped activities while the device is sleeping\\\" into nyc-dev am: f159b74608 am: 6d296286e4\" into nyc-mr1-dev-plus-aosp
am: c9077221bb
Change-Id: If2a00e182c0e622ac42cad97c2683929afdbb702
|
2016-06-20 23:26:32 +00:00 |
|
Wei Jia
|
93bb29ddd8
|
Merge \"Merge \\\"MediaPlayer: fix java doc for setPlaybackParams.\\\" into nyc-dev am: bd45be5032 am: 24ac2ece50\" into nyc-mr1-dev-plus-aosp
am: 7d145e279b
Change-Id: I907535cf2c10c9d0139dda0768f24fbf503d4217
|
2016-06-20 23:26:30 +00:00 |
|
Wale Ogunwale
|
582a546a90
|
Merge \\\"Don\\\'t re-launch stopped activities while the device is sleeping\\\" into nyc-dev am: f159b74608 am: 87ca3c1fa5
am: f7779b4bcf
Change-Id: I866ca87bafc9d2ed16160cff4d5b18f7d46768ba
|
2016-06-20 23:26:26 +00:00 |
|
Android Build Merger (Role)
|
c9077221bb
|
Merge "Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am: f159b74608 am: 6d296286e4" into nyc-mr1-dev-plus-aosp
|
2016-06-20 23:16:50 +00:00 |
|
Android Build Merger (Role)
|
7d145e279b
|
Merge "Merge \\"MediaPlayer: fix java doc for setPlaybackParams.\\" into nyc-dev am: bd45be5032 am: 24ac2ece50" into nyc-mr1-dev-plus-aosp
|
2016-06-20 23:16:39 +00:00 |
|
Wei Jia
|
66f61830e1
|
Merge \\\"MediaPlayer: fix java doc for setPlaybackParams.\\\" into nyc-dev am: bd45be5032 am: 2beba073d1
am: b3660d6930
Change-Id: I7525ae0ebcf0440b8fc2deb224719e768ab3e5f3
|
2016-06-20 23:16:37 +00:00 |
|
Wale Ogunwale
|
a552f9deda
|
Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am: f159b74608
am: 6d296286e4
Change-Id: I338f8d2cf0124a36b61d01dfa79dee91128506ac
|
2016-06-20 23:15:58 +00:00 |
|
Wale Ogunwale
|
f7779b4bcf
|
Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am: f159b74608
am: 87ca3c1fa5
Change-Id: I14d57d688026d06bc4cad7c492f80a41b8e5bb85
|
2016-06-20 23:15:54 +00:00 |
|
Wei Jia
|
851e5a7e56
|
Merge \\"MediaPlayer: fix java doc for setPlaybackParams.\\" into nyc-dev am: bd45be5032
am: 24ac2ece50
Change-Id: I2c910192085820a004176f77d1f042e9869224fe
|
2016-06-20 23:15:54 +00:00 |
|
Wale Ogunwale
|
87ca3c1fa5
|
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am: f159b74608
Change-Id: Iaf6cdfd3e6b7ec6a1e1d37cc200b196d105f1ef7
|
2016-06-20 23:08:12 +00:00 |
|
Wei Jia
|
b3660d6930
|
Merge \\"MediaPlayer: fix java doc for setPlaybackParams.\\" into nyc-dev am: bd45be5032
am: 2beba073d1
Change-Id: I55f86f536f55ddd7fdbd8b9b682aad88e25230a5
|
2016-06-20 23:08:06 +00:00 |
|
Wale Ogunwale
|
6d296286e4
|
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am: f159b74608
Change-Id: I83edfb392f0f179b4c28aaab3eba0c51fe11d207
|
2016-06-20 23:07:55 +00:00 |
|
Wei Jia
|
24ac2ece50
|
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am: bd45be5032
Change-Id: I23b24e3430335e037809da0c0721bf1de0e529dd
|
2016-06-20 23:07:53 +00:00 |
|
TreeHugger Robot
|
f159b74608
|
Merge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev
|
2016-06-20 23:03:46 +00:00 |
|
Wei Jia
|
2beba073d1
|
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am: bd45be5032
Change-Id: I1b3604fe84dacf3febf324de154cad00fcd688b8
|
2016-06-20 23:03:20 +00:00 |
|
Sudheer Shanka
|
8996f90ae3
|
Merge \\\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\\" into nyc-dev am: f00e780472 am: 2050cfd7ba
am: 90483c4e21
Change-Id: Id52f59478b637b38dd48e4f1d2089027ba2b094d
|
2016-06-20 23:00:08 +00:00 |
|
Scott Main
|
40c88a36e5
|
Merge \"Merge \\\"just a reorg of some links to put all Android Studio help button redirects together\\\" into nyc-dev am: db4ef3f4f8 am: bceacc42a2\" into nyc-mr1-dev-plus-aosp
am: 02221a3349
Change-Id: Ia6d053dfe9bac3e4122aa556d76f8473937dea77
|
2016-06-20 23:00:06 +00:00 |
|
Sudheer Shanka
|
5eeb1dd44a
|
Merge \\\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\\" into nyc-dev am: f00e780472 am: 7aecaf8d52
am: 8ecf1e52ba
Change-Id: Ic63f937457b39d56f1ac79adc082efc2196e429b
|
2016-06-20 23:00:03 +00:00 |
|
Wei Jia
|
bd45be5032
|
Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev
|
2016-06-20 22:58:34 +00:00 |
|
Wei Jia
|
ce4957eb37
|
MediaPlayer: fix java doc for setPlaybackParams.
Bug: 29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
|
2016-06-20 15:57:23 -07:00 |
|
Sudheer Shanka
|
90483c4e21
|
Merge \\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\" into nyc-dev am: f00e780472
am: 2050cfd7ba
Change-Id: I52bf33ff9a31e716bf1b1ac289e3115d0fc47ed5
|
2016-06-20 22:52:32 +00:00 |
|
Scott Main
|
09158ad359
|
Merge \"Merge \\\"just a reorg of some links to put all Android Studio help button redirects together\\\" into nyc-dev am: db4ef3f4f8 am: b595fdc0e9\" into nyc-mr1-dev-plus-aosp
am: 1ef7fe8bda
Change-Id: I7cf5a9f40596880b24168dfd113fcb360e1b2c86
|
2016-06-20 22:50:15 +00:00 |
|
Antonio Cansado
|
b66c89920d
|
Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am: c20ffc2a9e am: 43f0bd6e60
am: ee97e6f183
Change-Id: I0044bb10437d67bed5041cec9b58ae231b820f80
|
2016-06-20 22:50:11 +00:00 |
|
Android Build Merger (Role)
|
02221a3349
|
Merge "Merge \\"just a reorg of some links to put all Android Studio help button redirects together\\" into nyc-dev am: db4ef3f4f8 am: bceacc42a2" into nyc-mr1-dev-plus-aosp
|
2016-06-20 22:49:56 +00:00 |
|
Sudheer Shanka
|
2050cfd7ba
|
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
am: f00e780472
Change-Id: I542e11688a52dd3cde8fd8c3df252b2ead0e5240
|
2016-06-20 22:49:34 +00:00 |
|
Scott Main
|
9bf0703ac3
|
Merge \\"just a reorg of some links to put all Android Studio help button redirects together\\" into nyc-dev am: db4ef3f4f8
am: bceacc42a2
Change-Id: I859f800bee338968a2b242a224c71e0880e0a306
|
2016-06-20 22:49:31 +00:00 |
|
Sudheer Shanka
|
8ecf1e52ba
|
Merge \\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\" into nyc-dev am: f00e780472
am: 7aecaf8d52
Change-Id: I62c705da440cc61e5a9bc9d8df7e781e0ec3d87d
|
2016-06-20 22:49:27 +00:00 |
|
Antonio Cansado
|
d3ae6a9c8e
|
Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am: c20ffc2a9e am: 13cf0e7d54
am: 1d4fd3ed27
Change-Id: I5140373d930726e0b93fa62ac03315a37c581b5b
|
2016-06-20 22:44:51 +00:00 |
|
Android Build Merger (Role)
|
1ef7fe8bda
|
Merge "Merge \\"just a reorg of some links to put all Android Studio help button redirects together\\" into nyc-dev am: db4ef3f4f8 am: b595fdc0e9" into nyc-mr1-dev-plus-aosp
|
2016-06-20 22:44:15 +00:00 |
|
Scott Main
|
ee20cbe4f3
|
Merge \\"just a reorg of some links to put all Android Studio help button redirects together\\" into nyc-dev am: db4ef3f4f8
am: b595fdc0e9
Change-Id: Idd65315a08cb2047e252a2c77c499d0de08377a8
|
2016-06-20 22:43:36 +00:00 |
|
Philip P. Moltmann
|
6d3ec95a6f
|
Make print via cloud confirm diag fragment public
Fixes: 29516187
Change-Id: I91266704de130b761c0c3f5d53c465c1c21dfe5a
|
2016-06-20 15:43:35 -07:00 |
|
Sudheer Shanka
|
7aecaf8d52
|
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
am: f00e780472
Change-Id: Iff3282ba0b141652697c7100ff5db77906666f2e
|
2016-06-20 22:43:21 +00:00 |
|
smain@google.com
|
bceacc42a2
|
Merge \"just a reorg of some links to put all Android Studio help button redirects together\" into nyc-dev
am: db4ef3f4f8
Change-Id: Ie519bb30a4fc09c98901098b7124dfd5fef39238
|
2016-06-20 22:43:05 +00:00 |
|
Antonio Cansado
|
ee97e6f183
|
Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am: c20ffc2a9e
am: 43f0bd6e60
Change-Id: I9337468b820d214f4d40f0768f45c11860cef068
|
2016-06-20 22:42:15 +00:00 |
|
Dianne Hackborn
|
6f897ec7c3
|
Merge \\\"Fix issue #29438842: Enter the \\\"am broadcast -a...\\\" into nyc-dev am: d2480ab7bb am: 2fcd92182a
am: 87ee785316
Change-Id: I6d3964ec06a39093ca43c3b2d17f989e8098bab1
|
2016-06-20 22:40:41 +00:00 |
|
Roozbeh Pournader
|
152f56aa1b
|
Merge \\"Revert \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\"\\" into nyc-mr1-dev am: 55d9051e58
am: 2704d4ead1 -s ours
Change-Id: Icb8b53c17aa76979f779361c202d209ac17bc63f
|
2016-06-20 22:40:40 +00:00 |
|
Hemal Patel
|
7c425a76de
|
Docs: Changed sample link under Related Samples am: ab5de09e7e am: d5af0a1214 am: 2a3336813a am: 549f0f3f0c
am: e41f004ee1
Change-Id: I259468a2a82e21867a9d1a3bead62ce19bf188f2
|
2016-06-20 22:40:38 +00:00 |
|
Dianne Hackborn
|
20e0a5c759
|
Merge \\\"Fix issue #29438842: Enter the \\\"am broadcast -a...\\\" into nyc-dev am: d2480ab7bb am: 61923ced0c
am: a2391dcc6f
Change-Id: I060c6e600e4d27ac63bbc3b1befc7e574d12d1d7
|
2016-06-20 22:40:36 +00:00 |
|
Hemal Patel
|
f7ee0ef3ef
|
Docs: Changed sample link under Related Samples am: ab5de09e7e am: d5af0a1214 am: 2a3336813a am: 40f8005156
am: 96fe18e80b
Change-Id: I793c6cf5be4f6cec45505a8d84425a2eb3d1772f
|
2016-06-20 22:40:33 +00:00 |
|
smain@google.com
|
b595fdc0e9
|
Merge \"just a reorg of some links to put all Android Studio help button redirects together\" into nyc-dev
am: db4ef3f4f8
Change-Id: Ib2bcfa6c5bdfb7475b714c5fef947b3f173f1914
|
2016-06-20 22:40:24 +00:00 |
|
sergeyv
|
422e2b4829
|
HWUI: move microbench to APCT infrastructure
bug:29515780
Change-Id: I06f0518e2948d4268a1fa8ec99e08b5fcaaa3afd
|
2016-06-20 22:39:26 +00:00 |
|
Sudheer Shanka
|
f00e780472
|
Merge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission." into nyc-dev
|
2016-06-20 22:38:51 +00:00 |
|
Antonio Cansado
|
1d4fd3ed27
|
Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am: c20ffc2a9e
am: 13cf0e7d54
Change-Id: Idb7a28cf53e4c1b963df2dc0aff8de47d9ca8069
|
2016-06-20 22:36:49 +00:00 |
|