Bryce Lee
b45d3926f3
am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev
...
* commit '8320cf2de357265179c3007256394b0cbb69d949':
Fix wrong intent being passed in PhoneWindowManager.
2015-03-19 21:30:43 +00:00
Yang Ni
c077ee316e
Merge "Added copyright notice and formatted to convention"
2015-03-19 21:28:13 +00:00
Bryce Lee
8320cf2de3
Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev
2015-03-19 21:24:52 +00:00
Bo Liu
17a7989904
Remove debug logging from WebView
...
Moving them to chromium:
https://codereview.chromium.org/1022993002/
Change-Id: I6a9294b7041e9768397a624e5c174b22f4085e87
2015-03-19 14:19:29 -07:00
Guang Zhu
8d09a7445e
Merge "pass stream contents in separate thread for executeShellCommand"
2015-03-19 21:14:15 +00:00
Winson Chung
d0aa8a374f
Fixing issue with screen-pinning for secondary users.
...
- Proxy the screen pinning request to the SystemUI for the primary user.
Bug: 19395305
Change-Id: I6252d4ee05b2bea4e76b2a4d0b903e2866fffa76
2015-03-19 14:11:27 -07:00
Joe Fernandez
d81e0056f5
am 33e84c16: am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
...
* commit '33e84c167863745514b56b97c391f8d8913ca05e':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
2015-03-19 21:04:19 +00:00
Joe Fernandez
3c48647e4a
am 58273493: am 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK re
...
* commit '5827349328bd3f647c55ba271ec4f87e96a25ced':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
2015-03-19 21:04:12 +00:00
Joe Fernandez
b032c39a8b
am b89cdf1e: am 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs
...
* commit 'b89cdf1ef452db6f21a94c8e122091b74833e3f3':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
2015-03-19 21:04:03 +00:00
Joe Fernandez
33e84c1678
am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
...
* commit '8ca83e0504cb3b8d78c1a07bd49a73c58433671b':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
2015-03-19 20:56:45 +00:00
Joe Fernandez
5827349328
am 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" int
...
* commit '1e81b070f772fdef45d7bedc0de0304603e05a95':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
2015-03-19 20:56:33 +00:00
Joe Fernandez
b89cdf1ef4
am 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs
...
* commit '5c1a3ab4216333696947eefee4d022f708e4c053':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
2015-03-19 20:56:25 +00:00
Miao Wang
815bcb24b0
am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
...
* commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625':
[RenderScript] Remove duplicate include in jni
2015-03-19 20:54:40 +00:00
Eric Gilmore
4496b0a539
am 3e90fa59: am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
...
* commit '3e90fa590857e43f0ed86eac18f0b02afca44b88':
Changes for a quick, pre-migration bug sprint:
2015-03-19 20:54:31 +00:00
Joe Fernandez
8ca83e0504
am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
...
* commit '0362d6e0c836cd48beb928f053d97dcc3961c110':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
2015-03-19 20:49:52 +00:00
Joe Fernandez
1e81b070f7
am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
...
* commit 'e41abf4a304675bda37de7b796258f7f322d61ea':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
2015-03-19 20:49:48 +00:00
Joe Fernandez
5c1a3ab421
am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs
...
* commit 'd7df900a80f4c7af1f16efc0a8bcf044a2a7ff4d':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
2015-03-19 20:49:41 +00:00
Miao Wang
f8a69f562b
am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
...
* commit '2ef9955c827e0348a65b4f787e206925f4663197':
[RenderScript] Remove duplicate include in jni
2015-03-19 20:49:15 +00:00
Eric Gilmore
3e90fa5908
am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
...
* commit '680f36a88ff1c43e928066122505ec05c50d9942':
Changes for a quick, pre-migration bug sprint:
2015-03-19 20:46:28 +00:00
Joe Fernandez
0362d6e0c8
am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
...
* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
2015-03-19 20:42:36 +00:00
Joe Fernandez
e41abf4a30
am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
...
* commit '43929db6487f295c4bca1a499a5299da77ad2161':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
2015-03-19 20:42:30 +00:00
Joe Fernandez
d7df900a80
am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs
...
* commit 'a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
2015-03-19 20:42:23 +00:00
Eric Gilmore
680f36a88f
am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
...
* commit '66e529aa34034d044c496c330ba89026ee293253':
Changes for a quick, pre-migration bug sprint:
2015-03-19 20:38:49 +00:00
Miao Wang
2ef9955c82
Merge "[RenderScript] Remove duplicate include in jni"
2015-03-19 20:35:56 +00:00
Joe Fernandez
bb777ef40d
am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
...
* commit 'b88bce219abf7fcad50ac105183bd79da0b9893c':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
2015-03-19 20:35:09 +00:00
Joe Fernandez
43929db648
am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
...
* commit 'f761e4c20ee63873043522990487ecd15bb18966':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
2015-03-19 20:35:05 +00:00
Joe Fernandez
a06c8ff08e
am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs
...
* commit '36b2c1609d17317bb9d3977e46ada21275f54d65':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
2015-03-19 20:34:59 +00:00
Eric Gilmore
66e529aa34
am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
...
* commit '1f07cfb6011e3d30847f0e7012bcef9e93c0fa5f':
Changes for a quick, pre-migration bug sprint:
2015-03-19 20:32:03 +00:00
Joe Fernandez
b88bce219a
am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
...
* commit 'c773358d599d9dd7716db88b0699a7903d64ad9b':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
2015-03-19 20:28:54 +00:00
Joe Fernandez
f761e4c20e
am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
...
* commit 'd91167e8ceda64809e9afd73ac184dc319a276f5':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
2015-03-19 20:28:45 +00:00
Joe Fernandez
36b2c1609d
am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs
...
* commit 'bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
2015-03-19 20:28:40 +00:00
Bryce Lee
9cd2e62612
Fix wrong intent being passed in PhoneWindowManager.
...
When starting going home for Wear, the intent extra indicating the
intent is coming from a button press must be set. This was lost during
a merge conflict resolution.
Bug: 19832892
Change-Id: I6b77757b34f99dd754194448fdea9165690fc90f
2015-03-19 13:27:26 -07:00
Eric Gilmore
1f07cfb601
am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
...
* commit '0fdeefbdad81e92a5fdb5acc7f92fc92a28654b4':
Changes for a quick, pre-migration bug sprint:
2015-03-19 20:24:57 +00:00
Joe Fernandez
c773358d59
am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
...
* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
2015-03-19 20:21:47 +00:00
Joe Fernandez
d91167e8ce
am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
...
* commit '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
2015-03-19 20:21:43 +00:00
Joe Fernandez
bacdd2b8de
am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs
...
* commit 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
2015-03-19 20:21:37 +00:00
Rich Slogar
c259ba0390
am a29a34b0: am efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
...
* commit 'a29a34b0540a895c75f6d516ec4cc9860be6253d':
docs: proguard help update
2015-03-19 20:17:37 +00:00
Eric Gilmore
0fdeefbdad
am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
...
* commit 'cf1586d3fb4e3232aa4f4679eb389bcf89415b15':
Changes for a quick, pre-migration bug sprint:
2015-03-19 20:17:22 +00:00
Joe Fernandez
dd461b2988
Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
2015-03-19 20:16:32 +00:00
Joe Fernandez
80f947c8b4
Merge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
2015-03-19 20:16:21 +00:00
Joe Fernandez
ef7d80811d
Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs
2015-03-19 20:16:05 +00:00
Rich Slogar
a29a34b054
am efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
...
* commit 'efa9bfac1aaa558ed6856581c424d6ffc507b0b1':
docs: proguard help update
2015-03-19 20:11:09 +00:00
Eric Gilmore
cf1586d3fb
am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
...
* commit 'e43a64e3336548094571885944afc28792e24fa0':
Changes for a quick, pre-migration bug sprint:
2015-03-19 20:10:55 +00:00
Eric Gilmore
e43a64e333
Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
2015-03-19 20:05:50 +00:00
Rich Slogar
efa9bfac1a
am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
...
* commit 'e3d92a205b5c1bfde3ceff1fe4ca9a62cc5cb4fc':
docs: proguard help update
2015-03-19 20:02:31 +00:00
Rich Slogar
e3d92a205b
am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
...
* commit '983dd1a9d1dc5a6d0bc72fcbc87b5194df09c048':
docs: proguard help update
2015-03-19 19:54:30 +00:00
Rich Slogar
983dd1a9d1
am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
...
* commit 'b569ec3cc1366e3e3caa96fa40a9fc14ed9c6121':
docs: proguard help update
2015-03-19 19:47:03 +00:00
Rich Slogar
b569ec3cc1
am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
...
* commit 'd76aa14cf401ca794b585b2312528121c651a537':
docs: proguard help update
2015-03-19 19:39:27 +00:00
Rich Slogar
d76aa14cf4
am d5885842: Merge "docs: proguard help update" into lmp-docs
...
* commit 'd58858427e102bec7ebe1d2a8ce418529924a68c':
docs: proguard help update
2015-03-19 19:10:06 +00:00
Rich Slogar
d58858427e
Merge "docs: proguard help update" into lmp-docs
2015-03-19 19:04:05 +00:00
