OSDN Git Service
Lajos Molnar [Tue, 28 Jun 2016 22:37:28 +0000 (22:37 +0000)]
Merge \\\"media: document rotation and scaling issues for MediaCodec\\\" into nyc-dev am:
af9d9f9b3e am:
2d9139410f
am:
3cdb912b8a
Change-Id: Ie16da0d7856495f659f8f90bbf2c490312555e38
Lajos Molnar [Tue, 28 Jun 2016 22:37:25 +0000 (22:37 +0000)]
Merge \\\"media: document format keys for MediaExtractor/CodecCapabilities\\\" into nyc-dev am:
556e012979 am:
29522123db
am:
65e4e1c084
Change-Id: Id977be3b13da8821fce8c5a04d096f604b59df75
Lajos Molnar [Tue, 28 Jun 2016 22:31:55 +0000 (22:31 +0000)]
Merge \\"media: document rotation and scaling issues for MediaCodec\\" into nyc-dev am:
af9d9f9b3e
am:
2d9139410f
Change-Id: I7f46ee8cf0cc5c16b235186c30bb72db8005fa6a
Lajos Molnar [Tue, 28 Jun 2016 22:31:52 +0000 (22:31 +0000)]
Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am:
556e012979
am:
29522123db
Change-Id: I7e062dcc471284c84fe8d186babece0dfb34a0bb
Lajos Molnar [Tue, 28 Jun 2016 22:27:05 +0000 (22:27 +0000)]
Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am:
af9d9f9b3e
Change-Id: I9a34f84efbc54d49ecc90c1e095be643d26876d3
Lajos Molnar [Tue, 28 Jun 2016 22:26:58 +0000 (22:26 +0000)]
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am:
556e012979
Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f
TreeHugger Robot [Tue, 28 Jun 2016 22:22:20 +0000 (22:22 +0000)]
Merge "sysui: handle single master volume case."
Lajos Molnar [Tue, 28 Jun 2016 22:21:01 +0000 (22:21 +0000)]
Merge "media: document rotation and scaling issues for MediaCodec" into nyc-dev
Lajos Molnar [Tue, 28 Jun 2016 22:19:29 +0000 (22:19 +0000)]
Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-dev
Stan Iliev [Tue, 28 Jun 2016 22:12:30 +0000 (22:12 +0000)]
Merge "Fix wording regarding ThreadedRenderer"
Oren Blasberg [Tue, 28 Jun 2016 21:37:04 +0000 (21:37 +0000)]
Merge \\\"Fix popup context menu appearing brokenly.\\\" into nyc-dev am:
29ea814354 am:
b926d0e8ef
am:
7910b5518e
Change-Id: Ia96b93b4e344b9ae4118099943d60cfd43114d0f
Oren Blasberg [Tue, 28 Jun 2016 21:28:43 +0000 (21:28 +0000)]
Merge \\\"Fix popup context menu appearing brokenly.\\\" into nyc-dev am:
29ea814354 am:
9585012ce3
am:
15056b2838
Change-Id: Ie514c22821ef4dc82ea758608172a56f92caf8e7
Oren Blasberg [Tue, 28 Jun 2016 21:28:06 +0000 (21:28 +0000)]
Merge \\"Fix popup context menu appearing brokenly.\\" into nyc-dev am:
29ea814354
am:
b926d0e8ef
Change-Id: I1ea1b512c8518cc7fd7fc00de4a8a6c3157688b0
Oren Blasberg [Tue, 28 Jun 2016 21:24:49 +0000 (21:24 +0000)]
Merge \\"Fix popup context menu appearing brokenly.\\" into nyc-dev am:
29ea814354
am:
9585012ce3
Change-Id: Iaff4d5d9c341f2c14a2c19eaf0675e17ce8d5a0e
Oren Blasberg [Tue, 28 Jun 2016 21:20:02 +0000 (21:20 +0000)]
Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am:
29ea814354
Change-Id: I1fdc4c75bf763a3e0c1411230e5a0cdc21ad882a
Oren Blasberg [Tue, 28 Jun 2016 21:19:30 +0000 (21:19 +0000)]
Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am:
29ea814354
Change-Id: I722e88756c576acca7419d53738d5883bf864260
Oren Blasberg [Tue, 28 Jun 2016 21:12:26 +0000 (21:12 +0000)]
Merge "Fix popup context menu appearing brokenly." into nyc-dev
Felipe Leme [Tue, 28 Jun 2016 21:00:04 +0000 (21:00 +0000)]
Merge \"Merge \\\"Remove redundant setPendingIntentWhitelistDuration() calls.\\\" into nyc-dev am:
c1374208e3 am:
2f285643bf\" into nyc-mr1-dev-plus-aosp
am:
97f620db3d
Change-Id: I9e6180d74ec42b7d1286c13e1bfaa07b60bc2a0a
Felipe Leme [Tue, 28 Jun 2016 20:59:55 +0000 (20:59 +0000)]
Merge \\"Merge \\\"Remove redundant setPendingIntentWhitelistDuration() calls.\\\" into nyc-dev am:
c1374208e3\\" into nyc-mr1-dev am:
b1400b142e
am:
62e46e8899
Change-Id: Id8aed75038fed88c8c11a1d953726712b7005c62
Todd Kennedy [Tue, 28 Jun 2016 20:59:47 +0000 (20:59 +0000)]
Merge \\"Define deprecated fields in IntDef\\'s\\" into nyc-mr1-dev am:
23bc74a8d5
am:
c3575b2149
Change-Id: Ic1d2ac7e3cdb06ce1b01661dac1981aafc05b260
Android Build Merger (Role) [Tue, 28 Jun 2016 20:55:45 +0000 (20:55 +0000)]
Merge "Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am:
c1374208e3 am:
2f285643bf" into nyc-mr1-dev-plus-aosp
Felipe Leme [Tue, 28 Jun 2016 20:55:16 +0000 (20:55 +0000)]
Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am:
c1374208e3
am:
2f285643bf
Change-Id: Ibe5b63413e9068ec5de11b78343373d07af77dfa
Felipe Leme [Tue, 28 Jun 2016 20:53:43 +0000 (20:53 +0000)]
Merge \"Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am:
c1374208e3\" into nyc-mr1-dev
am:
b1400b142e
Change-Id: I72cddf720ef8f3efd58ebbe79a2aa3e66a85c95a
Todd Kennedy [Tue, 28 Jun 2016 20:53:40 +0000 (20:53 +0000)]
Merge \"Define deprecated fields in IntDef\'s\" into nyc-mr1-dev
am:
23bc74a8d5
Change-Id: Ic8648d5acff4afdb65074eb9313be082482e2b17
Muyuan Li [Tue, 21 Jun 2016 21:21:48 +0000 (14:21 -0700)]
sysui: handle single master volume case.
Bug:
29446492
Change-Id: Id7414b0cb28d5586f4162850cc67b07c4bee2f6a
(cherry picked from commit
4715f4bb72ed888e392f501a7c1eb8a533e2b33d)
Android Build Merger (Role) [Tue, 28 Jun 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am:
c1374208e3" into nyc-mr1-dev
Felipe Leme [Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)]
Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am:
c1374208e3
Change-Id: Iae3e7fb2ff674046422cc77f10761c8543cd83c5
Felipe Leme [Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)]
Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am:
c1374208e3
Change-Id: Ie02a847ac513f89c1c430af0e3f559cf0bc2039d
TreeHugger Robot [Tue, 28 Jun 2016 20:48:36 +0000 (20:48 +0000)]
Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev
TreeHugger Robot [Tue, 28 Jun 2016 20:45:37 +0000 (20:45 +0000)]
Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev
Stan Iliev [Tue, 28 Jun 2016 17:33:15 +0000 (13:33 -0400)]
Fix wording regarding ThreadedRenderer
ThreadedRenderer is not synonymous with hardware rendering, so
remove references to hardware rendering when referring to
ThreadedRenderer.
Change-Id: Ic66a482ccf05f556ebe6ec194ce4f858f75bbb8b
Kirill Grouchnikov [Tue, 28 Jun 2016 20:35:34 +0000 (20:35 +0000)]
Merge "Fix RemoteViews Javadocs for a couple of methods."
Jeff Sharkey [Tue, 28 Jun 2016 20:29:14 +0000 (20:29 +0000)]
Merge \\"Show notification while PRE_BOOT receivers run.\\" into nyc-mr1-dev am:
9d07eed168
am:
59f3efc40d
Change-Id: I5819b07cd2e71d42bc4834950322c01af8149b15
Jeff Sharkey [Tue, 28 Jun 2016 20:24:27 +0000 (20:24 +0000)]
Merge \"Show notification while PRE_BOOT receivers run.\" into nyc-mr1-dev
am:
9d07eed168
Change-Id: I99b62fc38f0f83f78f1f9a1cb627685160b9862f
TreeHugger Robot [Tue, 28 Jun 2016 20:18:58 +0000 (20:18 +0000)]
Merge "Show notification while PRE_BOOT receivers run." into nyc-mr1-dev
Oren Blasberg [Tue, 28 Jun 2016 18:07:42 +0000 (11:07 -0700)]
Fix popup context menu appearing brokenly.
Add missing attribute to the base Theme to ensure the context menu
does not appear completely invisibly.
Bug:
29796385
Change-Id: I4f50579622e97656e09a5ddb6e13313f84efc972
Felipe Leme [Tue, 28 Jun 2016 19:38:05 +0000 (19:38 +0000)]
Merge \\\"Fixed whitelistManager set on unbindServiceLocked()\\\" into nyc-dev am:
8d78c33c9b am:
bdf1c719c9
am:
50f7bb230b
Change-Id: I832ec91bd775adefc4d69ff4bd5106340554be93
Kirill Grouchnikov [Tue, 28 Jun 2016 19:34:13 +0000 (15:34 -0400)]
Fix RemoteViews Javadocs for a couple of methods.
Change-Id: Ie87003bcb0d0c43185e5482e91faee84a798aaee
Felipe Leme [Tue, 28 Jun 2016 19:32:50 +0000 (19:32 +0000)]
Merge \\\"Fixed whitelistManager set on unbindServiceLocked()\\\" into nyc-dev am:
8d78c33c9b am:
ef5c3aad4d
am:
cb9c52fd80
Change-Id: I17e1697ced6f5c44e47f85245b637c82880e27d3
Felipe Leme [Tue, 28 Jun 2016 19:32:36 +0000 (19:32 +0000)]
Merge \\"Fixed whitelistManager set on unbindServiceLocked()\\" into nyc-dev am:
8d78c33c9b
am:
bdf1c719c9
Change-Id: Ic7573a7162299502beae0e1a11e6b41fa9bf4371
Todd Kennedy [Tue, 28 Jun 2016 19:27:36 +0000 (19:27 +0000)]
Merge \"Merge \\\"Default minSdkVersion to \\\'1\\\'\\\" into nyc-dev am:
a98e3e3ede am:
08739a2778\" into nyc-mr1-dev-plus-aosp
am:
68d6fab1ab
Change-Id: I357e4b7bdbd159ffbfaf8c429112db48d9f4d62f
Todd Kennedy [Tue, 28 Jun 2016 19:27:33 +0000 (19:27 +0000)]
Merge \\\"Default minSdkVersion to \\\'1\\\'\\\" into nyc-dev am:
a98e3e3ede am:
a1066ed6c2
am:
e3cc3d8ad4
Change-Id: I42b6c96d661f4f8b3036513303f319c010c00485
Felipe Leme [Tue, 28 Jun 2016 19:27:06 +0000 (19:27 +0000)]
Merge \\"Fixed whitelistManager set on unbindServiceLocked()\\" into nyc-dev am:
8d78c33c9b
am:
ef5c3aad4d
Change-Id: I311e10a4d9406539dfa7c540476b1bf86ebdad8c
Android Build Merger (Role) [Tue, 28 Jun 2016 19:23:13 +0000 (19:23 +0000)]
Merge "Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am:
a98e3e3ede am:
08739a2778" into nyc-mr1-dev-plus-aosp
Todd Kennedy [Tue, 28 Jun 2016 19:22:44 +0000 (19:22 +0000)]
Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am:
a98e3e3ede
am:
08739a2778
Change-Id: Ic0544185f6fd38d23c7d13d7f842099757ffb70d
Felipe Leme [Tue, 28 Jun 2016 19:22:34 +0000 (19:22 +0000)]
Merge \"Fixed whitelistManager set on unbindServiceLocked()\" into nyc-dev
am:
8d78c33c9b
Change-Id: Ie86c30d925119f4ebfdb420ff0093d508e8274cb
Todd Kennedy [Tue, 28 Jun 2016 19:22:25 +0000 (19:22 +0000)]
Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am:
a98e3e3ede
am:
a1066ed6c2
Change-Id: I58d97cd42bc939a91d00bd6189a1c2ffcc913b37
Felipe Leme [Tue, 28 Jun 2016 19:22:23 +0000 (19:22 +0000)]
Merge \"Fixed whitelistManager set on unbindServiceLocked()\" into nyc-dev
am:
8d78c33c9b
Change-Id: I0339e6ae9261b1ebdd7bbed54540ca253b1b6fd9
Todd Kennedy [Tue, 28 Jun 2016 19:16:40 +0000 (19:16 +0000)]
Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am:
a98e3e3ede
Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
Todd Kennedy [Tue, 28 Jun 2016 19:16:35 +0000 (19:16 +0000)]
Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am:
a98e3e3ede
Change-Id: Ib3d99a331f49c2e8af2fcda24149314fc939f4c0
TreeHugger Robot [Tue, 28 Jun 2016 19:15:33 +0000 (19:15 +0000)]
Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev
Todd Kennedy [Tue, 28 Jun 2016 19:14:11 +0000 (12:14 -0700)]
Define deprecated fields in IntDef's
Tools need all of the valid constants to handle legacy apps; even
though we want developers to use the new constant names.
Bug:
29824931
Change-Id: I5f8055d50d1d3f32cfbed7459d8a497cfbd3661e
TreeHugger Robot [Tue, 28 Jun 2016 19:12:48 +0000 (19:12 +0000)]
Merge "Default minSdkVersion to '1'" into nyc-dev
Lajos Molnar [Tue, 28 Jun 2016 19:07:26 +0000 (19:07 +0000)]
Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-mr1-dev am:
41f0e20739
am:
b353834077
Change-Id: I4dd81ce125ba6bb0b5ff10c5b84cb5a1e4c958de
Lajos Molnar [Tue, 28 Jun 2016 19:01:57 +0000 (19:01 +0000)]
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-mr1-dev
am:
41f0e20739
Change-Id: I482ec13bc3cdf1d7b1a485c2c7baee5131102c56
TreeHugger Robot [Tue, 28 Jun 2016 18:54:23 +0000 (18:54 +0000)]
Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-mr1-dev
Jeff Sharkey [Tue, 28 Jun 2016 18:33:12 +0000 (12:33 -0600)]
Show notification while PRE_BOOT receivers run.
Awhile back, we switched to running PRE_BOOT receivers after the user
is unlocked. Since these receivers include providers like Contacts
and MediaStore that can take a long time to upgrade, it may result in
apps like Dialer or Photos appearing to hang, so we need to help the
user understand that the system is still upgrading in the background.
Bug:
28164677
Change-Id: I18448534b6067f8508b1ffb2d43c106c02c265a0
Chris Craik [Tue, 28 Jun 2016 18:37:42 +0000 (18:37 +0000)]
Merge \\"Clip GradientDrawable\\'s saveLayer\\" into nyc-mr1-dev am:
694acb1e36
am:
b22e745278
Change-Id: I331574caa364e87c5178bee544e1b6d570fb4ea5
Philip P. Moltmann [Tue, 28 Jun 2016 18:37:39 +0000 (18:37 +0000)]
Merge \\"Always reload print services\\" into nyc-mr1-dev am:
fd28d8ebd1
am:
14a4ec6574
Change-Id: I4d6afaca275e5596d601c707eeea928d4f089932
Felipe Leme [Tue, 28 Jun 2016 18:29:54 +0000 (11:29 -0700)]
Remove redundant setPendingIntentWhitelistDuration() calls.
Since all pending intents are stored on a Set in the Notication object,
there is no need to individually check for specific pending intents.
BUG:
29480440
Change-Id: I27a18bb535a9a4bb6cb4e76bdc189e6c315a684a
Chris Craik [Tue, 28 Jun 2016 18:33:24 +0000 (18:33 +0000)]
Merge \"Clip GradientDrawable\'s saveLayer\" into nyc-mr1-dev
am:
694acb1e36
Change-Id: I9c1ed4155674e7c7a218c2afe784dd703613d825
Philip P. Moltmann [Tue, 28 Jun 2016 18:33:18 +0000 (18:33 +0000)]
Merge \"Always reload print services\" into nyc-mr1-dev
am:
fd28d8ebd1
Change-Id: Idc3e793f637858355403cf5e21e9af43c6accb51
TreeHugger Robot [Tue, 28 Jun 2016 18:24:22 +0000 (18:24 +0000)]
Merge "Clip GradientDrawable's saveLayer" into nyc-mr1-dev
Philip P. Moltmann [Tue, 28 Jun 2016 18:15:37 +0000 (18:15 +0000)]
Merge "Always reload print services" into nyc-mr1-dev
Chris Craik [Tue, 28 Jun 2016 17:52:04 +0000 (17:52 +0000)]
Merge \"Merge \\"Fix savelayer rounding\\" into nyc-mr1-dev am:
754ea612ec\" into nyc-mr1-dev-plus-aosp
am:
46813558a3
Change-Id: I6afdba716240f52cfa0beba6fb70404bf00429f8
Allen Hair [Tue, 28 Jun 2016 17:51:58 +0000 (17:51 +0000)]
Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am:
15783f0073 am:
fb9d75e7cd
am:
568f654ac1
Change-Id: Ic58fc8aa667372d77836823cd77e0309e9b1e7c5
Felipe Leme [Tue, 28 Jun 2016 17:38:59 +0000 (10:38 -0700)]
Fixed whitelistManager set on unbindServiceLocked()
It must call updateWhitelistManagerLocked() because the app might have
other services with the whitelistManager set, in which case the process
record should not have whitelistManager reset.
Fixes:
29480440
Change-Id: I268278c646aaa89a352f02178b294c02c3c11d35
Allen Hair [Tue, 28 Jun 2016 17:40:56 +0000 (17:40 +0000)]
Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am:
15783f0073 am:
fb20170c0f
am:
b216e80956
Change-Id: Ib7d63464ea7a042ea5461ce62928ceb8a3c01c0b
Android Build Merger (Role) [Tue, 28 Jun 2016 17:39:51 +0000 (17:39 +0000)]
Merge "Merge \"Fix savelayer rounding\" into nyc-mr1-dev am:
754ea612ec" into nyc-mr1-dev-plus-aosp
Chris Craik [Tue, 28 Jun 2016 17:39:26 +0000 (17:39 +0000)]
Merge \"Fix savelayer rounding\" into nyc-mr1-dev
am:
754ea612ec
Change-Id: Ib86ae01c824b57c4c93562aefb6c264b02538e28
Lajos Molnar [Fri, 24 Jun 2016 01:07:58 +0000 (18:07 -0700)]
media: document rotation and scaling issues for MediaCodec
Bug:
23709311
Bug:
28512795
Change-Id: Iddebd13b4cd4c50bca8736d3aca71571ad16633a
Allen Hair [Tue, 28 Jun 2016 17:38:06 +0000 (17:38 +0000)]
Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am:
15783f0073
am:
fb9d75e7cd
Change-Id: I4a5d45d9c33b713e6bdf0596ea498c3e521c26d8
Allen Hair [Tue, 28 Jun 2016 17:33:34 +0000 (17:33 +0000)]
Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am:
15783f0073
am:
fb20170c0f
Change-Id: I23336cd7dac59a0e2510b718ede8ae3a389047ac
Chris Craik [Tue, 28 Jun 2016 17:33:26 +0000 (17:33 +0000)]
Merge "Fix savelayer rounding" into nyc-mr1-dev
Todd Kennedy [Tue, 28 Jun 2016 17:31:05 +0000 (10:31 -0700)]
Default minSdkVersion to '1'
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.
Bug:
29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
Allen Hair [Tue, 28 Jun 2016 17:30:28 +0000 (17:30 +0000)]
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am:
15783f0073
Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9
Allen Hair [Tue, 28 Jun 2016 17:30:21 +0000 (17:30 +0000)]
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am:
15783f0073
Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81
Allen Hair [Tue, 28 Jun 2016 17:23:54 +0000 (17:23 +0000)]
Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev
Lajos Molnar [Thu, 23 Jun 2016 23:52:29 +0000 (16:52 -0700)]
media: document format keys for MediaExtractor/CodecCapabilities
Bug:
29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
Chris Craik [Mon, 27 Jun 2016 23:30:27 +0000 (16:30 -0700)]
Fix savelayer rounding
bug:
29456451
Change-Id: I8022163d2c004510da5db74efdca27582484224d
Tenghui Zhu [Tue, 28 Jun 2016 16:47:17 +0000 (16:47 +0000)]
Merge "Use new Rule to report status when success"
Chris Craik [Tue, 28 Jun 2016 16:33:04 +0000 (09:33 -0700)]
Clip GradientDrawable's saveLayer
bug:
29456451
Avoid using very expensive unclipped saveLayer codepath.
Change-Id: Ib96a46169faa89eda6889b16813a7941ab402779
Daniel Yu [Tue, 28 Jun 2016 16:42:11 +0000 (16:42 +0000)]
Merge \\\"resolve merge conflicts of
ac5b340 to nyc-dev\\\" into nyc-dev am:
6ec78a6458 am:
82bd5246e7
am:
a7338f1467
Change-Id: I7d5f58b1bb4467d3f111baebb1cf5dcb5a7da6e8
Daniel Yu [Tue, 28 Jun 2016 16:37:50 +0000 (16:37 +0000)]
Merge \\\"resolve merge conflicts of
ac5b340 to nyc-dev\\\" into nyc-dev am:
6ec78a6458 am:
a2ffb20c06
am:
8555ed448e
Change-Id: I8d970b2b4c86c0b3d30bc645398111f46ca6e623
Dan Yu [Tue, 28 Jun 2016 16:36:55 +0000 (16:36 +0000)]
Merge \\"resolve merge conflicts of
ac5b340 to nyc-dev\\" into nyc-dev am:
6ec78a6458
am:
82bd5246e7
Change-Id: I668dddb48b464c61d77b2ddd4b94919c58356660
Dan Yu [Tue, 28 Jun 2016 16:32:01 +0000 (16:32 +0000)]
Merge \\"resolve merge conflicts of
ac5b340 to nyc-dev\\" into nyc-dev am:
6ec78a6458
am:
a2ffb20c06
Change-Id: I4f859ca20376c10f1638ce80b2ec33b515815809
Daniel Yu [Tue, 28 Jun 2016 16:28:34 +0000 (16:28 +0000)]
Merge \"resolve merge conflicts of
ac5b340 to nyc-dev\" into nyc-dev
am:
6ec78a6458
Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a
Daniel Yu [Tue, 28 Jun 2016 16:28:24 +0000 (16:28 +0000)]
Merge \"resolve merge conflicts of
ac5b340 to nyc-dev\" into nyc-dev
am:
6ec78a6458
Change-Id: Ie77c87f366c21acb05afcf5d03ddc6d75e9b950a
Philip P. Moltmann [Tue, 28 Jun 2016 16:25:17 +0000 (16:25 +0000)]
Merge \\"Syncronize renderPage vs. onServiceDisconnected\\" into nyc-mr1-dev am:
c7c647bbf0
am:
c76f44fab4
Change-Id: I780866bef6d476325a93777075bfce752ad84968
Dan Yu [Tue, 28 Jun 2016 16:21:56 +0000 (16:21 +0000)]
Merge "resolve merge conflicts of
ac5b340 to nyc-dev" into nyc-dev
Philip P. Moltmann [Tue, 28 Jun 2016 16:18:09 +0000 (16:18 +0000)]
Merge \"Syncronize renderPage vs. onServiceDisconnected\" into nyc-mr1-dev
am:
c7c647bbf0
Change-Id: Ibd18df2822dbb0993eb4fc22392c3c523197c540
Philip P. Moltmann [Tue, 28 Jun 2016 16:14:30 +0000 (16:14 +0000)]
Merge "Syncronize renderPage vs. onServiceDisconnected" into nyc-mr1-dev
Lajos Molnar [Tue, 28 Jun 2016 16:07:35 +0000 (16:07 +0000)]
Merge \\"media: document VP9 CSD for MediaCodec\\" into nyc-mr1-dev am:
5b2fd818a0
am:
c8fea44e5e
Change-Id: I7b6ceeb3192b7b421916bf957a868b1fc8816a62
Lajos Molnar [Tue, 28 Jun 2016 16:02:13 +0000 (16:02 +0000)]
Merge \"media: document VP9 CSD for MediaCodec\" into nyc-mr1-dev
am:
5b2fd818a0
Change-Id: Id7ed6f9342601ee8f67ff28f37c9b38b96e9c084
Kirill Grouchnikov [Tue, 28 Jun 2016 15:57:42 +0000 (15:57 +0000)]
Merge "Fix a typo in Javadocs"
TreeHugger Robot [Tue, 28 Jun 2016 15:56:41 +0000 (15:56 +0000)]
Merge "media: document VP9 CSD for MediaCodec" into nyc-mr1-dev
Chris Banes [Tue, 28 Jun 2016 15:52:54 +0000 (15:52 +0000)]
Merge "Make Toolbar ignore its minHeight if larger than height"
Shreyas Basarge [Tue, 28 Jun 2016 15:51:46 +0000 (15:51 +0000)]
Merge \"Merge \\\"SyncOperation float cast fix\\\" into nyc-dev am:
5f72b129c4 am:
5098fe97d6\" into nyc-mr1-dev-plus-aosp
am:
51d9947340
Change-Id: Ie06187023bcdf07126f73e38d606b894d84d68d8
Shreyas Basarge [Tue, 28 Jun 2016 15:51:43 +0000 (15:51 +0000)]
Merge \\\"SyncOperation float cast fix\\\" into nyc-dev am:
5f72b129c4 am:
0d27e2d624
am:
64b333c3c0
Change-Id: Ic046229411c7fb1e88e430fddf3b9c128c05b241
Android Build Merger (Role) [Tue, 28 Jun 2016 15:47:12 +0000 (15:47 +0000)]
Merge "Merge \\"SyncOperation float cast fix\\" into nyc-dev am:
5f72b129c4 am:
5098fe97d6" into nyc-mr1-dev-plus-aosp
OSDN Git Service
