OSDN Git Service
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:26:58 +0000 (22:26 +0000)]
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am:
556e012979
Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f
Lajos Molnar [Tue, 28 Jun 2016 22:19:29 +0000 (22:19 +0000)]
Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-dev
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
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
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
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:32:36 +0000 (19:32 +0000)]
Merge \\"Fixed whitelistManager set on unbindServiceLocked()\\" into nyc-dev am:
8d78c33c9b
am:
bdf1c719c9
Change-Id: Ic7573a7162299502beae0e1a11e6b41fa9bf4371
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: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
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
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
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
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
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
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
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:02:13 +0000 (16:02 +0000)]
Merge \"media: document VP9 CSD for MediaCodec\" into nyc-mr1-dev
am:
5b2fd818a0
Change-Id: Id7ed6f9342601ee8f67ff28f37c9b38b96e9c084
TreeHugger Robot [Tue, 28 Jun 2016 15:56:41 +0000 (15:56 +0000)]
Merge "media: document VP9 CSD for MediaCodec" into nyc-mr1-dev
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
Shreyas Basarge [Tue, 28 Jun 2016 15:46:42 +0000 (15:46 +0000)]
Merge \\"SyncOperation float cast fix\\" into nyc-dev am:
5f72b129c4
am:
5098fe97d6
Change-Id: Ia34d8f6d577cf4ebbd45872c19629ba821c0427b
Shreyas Basarge [Tue, 28 Jun 2016 15:46:37 +0000 (15:46 +0000)]
Merge \\"SyncOperation float cast fix\\" into nyc-dev am:
5f72b129c4
am:
0d27e2d624
Change-Id: I8d81d5db705e63fddfca9d652299eca9d4df207d
Shreyas Basarge [Tue, 28 Jun 2016 15:43:00 +0000 (15:43 +0000)]
Merge \"SyncOperation float cast fix\" into nyc-dev
am:
5f72b129c4
Change-Id: I50ab6249e81ff7523a82f26bd39b52bb362f4ae4
Shreyas Basarge [Tue, 28 Jun 2016 15:42:59 +0000 (15:42 +0000)]
Merge \"SyncOperation float cast fix\" into nyc-dev
am:
5f72b129c4
Change-Id: I907544c36783e192a17a2aa7f629a3093a516de2
Shreyas Basarge [Tue, 28 Jun 2016 15:38:05 +0000 (15:38 +0000)]
Merge "SyncOperation float cast fix" into nyc-dev
Lajos Molnar [Fri, 24 Jun 2016 00:52:48 +0000 (17:52 -0700)]
media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC.
Bug:
10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:58 +0000 (07:15 +0000)]
Merge "Purr. am:
610f6ede25 am:
0e792f567a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:48 +0000 (07:15 +0000)]
Merge "One final tweak to the platlogo. am:
4b7e415803 am:
d930306e13" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:41 +0000 (07:15 +0000)]
Merge "Purr. am:
610f6ede25 am:
45294a6859" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:33 +0000 (07:15 +0000)]
Merge "Fix SuperNotCalledException. am:
04f8cc2bb3 am:
33a199e241" into nyc-mr1-dev-plus-aosp
Dan Sandler [Tue, 28 Jun 2016 07:15:02 +0000 (07:15 +0000)]
Purr. am:
610f6ede25
am:
0e792f567a
Change-Id: I0ddf8f169e44a5c9d2be96277609d6f0b206e0f1
Dan Sandler [Tue, 28 Jun 2016 07:14:59 +0000 (07:14 +0000)]
One final tweak to the platlogo. am:
4b7e415803
am:
d930306e13
Change-Id: I8ce6d7d1718af2a98a624ad3c7f6ca693ddb2011
Dan Sandler [Tue, 28 Jun 2016 07:14:56 +0000 (07:14 +0000)]
Purr. am:
610f6ede25
am:
45294a6859
Change-Id: I6db945a4ca001c330d658549500521748172d081
Dan Sandler [Tue, 28 Jun 2016 07:14:56 +0000 (07:14 +0000)]
Fix SuperNotCalledException. am:
04f8cc2bb3
am:
33a199e241
Change-Id: I7ebf9e7db1a21e213e3a88c29d215eb6f701cbf6
Dan Sandler [Tue, 28 Jun 2016 07:14:54 +0000 (07:14 +0000)]
One final tweak to the platlogo. am:
4b7e415803
am:
3fae8ae0c6
Change-Id: Icf198e2c7d34703a4cd8856bc08f31925a20b622
Dan Sandler [Tue, 28 Jun 2016 07:14:51 +0000 (07:14 +0000)]
Fix SuperNotCalledException. am:
04f8cc2bb3
am:
ed48cbc8fc
Change-Id: Ie056fe7f9c1ab1a4cb0db9f262e158cedcb94706
Dan Sandler [Tue, 28 Jun 2016 07:07:35 +0000 (07:07 +0000)]
Purr.
am:
610f6ede25
Change-Id: I0dc3c9da110b8a92ecde6dbc28eb572a148ad6f5
Dan Sandler [Tue, 28 Jun 2016 07:07:31 +0000 (07:07 +0000)]
One final tweak to the platlogo.
am:
4b7e415803
Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae
Dan Sandler [Tue, 28 Jun 2016 07:07:28 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am:
04f8cc2bb3
Change-Id: Ic981a15b565092ea13a618c7ac0ed9d000854362
Dan Sandler [Tue, 28 Jun 2016 07:07:24 +0000 (07:07 +0000)]
Purr.
am:
610f6ede25
Change-Id: I252d53781fbe151b21909617ecb92ab9f2e9187a
Dan Sandler [Tue, 28 Jun 2016 07:07:22 +0000 (07:07 +0000)]
One final tweak to the platlogo.
am:
4b7e415803
Change-Id: Ibbe66c569c0be5fc1801d8af9b5810ac997854d8
Dan Sandler [Tue, 28 Jun 2016 07:07:20 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am:
04f8cc2bb3
Change-Id: I52977c00a41ec0db599b67cdc2617f1c602667a6
Dan Sandler [Tue, 28 Jun 2016 05:25:08 +0000 (01:25 -0400)]
Purr.
Bug:
27376882
Change-Id: I071d00c9a7847b8ff9b263ffd17581079b78a432
Dan Sandler [Tue, 28 Jun 2016 02:02:12 +0000 (22:02 -0400)]
One final tweak to the platlogo.
Bug:
27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f
Dan Sandler [Tue, 28 Jun 2016 01:33:27 +0000 (21:33 -0400)]
Fix SuperNotCalledException.
Q. Dan, how did you make such a basic newbie mistake?
A. new phone who dis
Bug:
29779845
Change-Id: Iecba53effcf6252df228afd2cc80df43b2afaa59
Hall Liu [Tue, 28 Jun 2016 02:34:00 +0000 (02:34 +0000)]
Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev
am:
2cd8281a23
Change-Id: I98ed6adcc49525db82c09a98e2c632894a4a0bc9
Hall Liu [Tue, 28 Jun 2016 02:29:04 +0000 (02:29 +0000)]
Merge "Add disable add call during video call extra and carrier config key" into nyc-mr1-dev
John Reck [Tue, 28 Jun 2016 01:31:02 +0000 (01:31 +0000)]
Merge \"Fix SurfaceViewPositionListener race bugs\" into nyc-mr1-dev
am:
8701bff9ba
Change-Id: I17b1cf4e81321edb04ae9ac99449160a705ba824
TreeHugger Robot [Tue, 28 Jun 2016 01:26:42 +0000 (01:26 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs" into nyc-mr1-dev
Amith Yamasani [Tue, 28 Jun 2016 01:06:47 +0000 (01:06 +0000)]
Merge \"Add tron logging for retail demo session counters\" into nyc-mr1-dev
am:
30a2b43f6d
Change-Id: Iaca49cc4aad9285e87d869b112b6c2986073f006
Amith Yamasani [Tue, 28 Jun 2016 01:03:16 +0000 (01:03 +0000)]
Merge "Add tron logging for retail demo session counters" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 28 Jun 2016 00:52:36 +0000 (00:52 +0000)]
Merge "Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am:
b2cd9c95bf am:
7878e736f7" into nyc-mr1-dev-plus-aosp
Svetoslav Ganov [Tue, 28 Jun 2016 00:52:04 +0000 (00:52 +0000)]
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am:
b2cd9c95bf
am:
7878e736f7
Change-Id: If05b82ba029bfce142c42eebd3336ca3d5bded3d
Svetoslav Ganov [Tue, 28 Jun 2016 00:52:01 +0000 (00:52 +0000)]
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am:
b2cd9c95bf
am:
5f7f3fa7a9
Change-Id: Id4bc3ae0c1d79174a22d669dccab3391c231357d
Svet Ganov [Tue, 28 Jun 2016 00:46:58 +0000 (00:46 +0000)]
Merge \"Mark app pending intents in notification extras\" into nyc-dev
am:
b2cd9c95bf
Change-Id: Iac3970763cbaac36ede1b17df7e65001ad6c8447
Svet Ganov [Tue, 28 Jun 2016 00:46:55 +0000 (00:46 +0000)]
Merge \"Mark app pending intents in notification extras\" into nyc-dev
am:
b2cd9c95bf
Change-Id: Idb515255f224c23d60a513713d9e4f93decd7a9c
Svetoslav Ganov [Tue, 28 Jun 2016 00:42:23 +0000 (00:42 +0000)]
Merge "Mark app pending intents in notification extras" into nyc-dev