OSDN Git Service
Yin-Chia Yeh [Fri, 6 Feb 2015 23:15:53 +0000 (15:15 -0800)]
Camera2: lens shading related HAL3.3 update
Codegen doc update.
Change-Id: I0e997b3e6fde7636bef3accdd0f8b7b969d37afa
Zhijun He [Mon, 9 Feb 2015 18:40:49 +0000 (10:40 -0800)]
Camera2: add precapture trigger CANCEL
Bug:
19265647
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
Yin-Chia Yeh [Fri, 6 Feb 2015 19:23:25 +0000 (11:23 -0800)]
Camera2: doc update for HAL3.3 tonemapping change
Codegen doc change.
Change-Id: Idd5185767c177f3179e5833be3f42357a5ead25f
Pavel Zhamaitsiak [Mon, 23 Mar 2015 22:12:04 +0000 (22:12 +0000)]
Merge "Wi-Fi Calling: Update strings" into lmp-mr1-wfc-dev
automerge:
eda354b
* commit '
eda354b7695a873dca210afb0c8516f8f3db164f':
Wi-Fi Calling: Update strings
Pavel Zhamaitsiak [Mon, 23 Mar 2015 21:59:35 +0000 (21:59 +0000)]
Merge "Wi-Fi Calling: Update strings" into lmp-mr1-wfc-dev
Pavel Zhamaitsiak [Mon, 23 Mar 2015 21:24:38 +0000 (14:24 -0700)]
Wi-Fi Calling: Update strings
- Update notification and alert messages for registration errors
- Move WFC mode summary strings from Settings in order to be able
to share between Dialer and Wireless settings
Change-Id: I12eee26f5e788d2cae5dfe1ce52e2038239fb2f3
Jeff Brown [Fri, 20 Mar 2015 22:22:31 +0000 (22:22 +0000)]
am
d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
automerge:
c19279e
* commit '
c19279ef93628448fbfb142d85ff80a6ad230425':
Disable more hotkeys while in setup.
Jeff Brown [Fri, 20 Mar 2015 22:12:48 +0000 (22:12 +0000)]
am
d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '
d62163055f983b95a954f1a6c2cbc8e0085a7ab5':
Disable more hotkeys while in setup.
Jeff Brown [Fri, 20 Mar 2015 22:05:06 +0000 (22:05 +0000)]
Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
Jeff Brown [Fri, 20 Mar 2015 01:26:30 +0000 (18:26 -0700)]
Disable more hotkeys while in setup.
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.
Bug:
19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
Paul Jensen [Fri, 20 Mar 2015 11:27:18 +0000 (11:27 +0000)]
Merge "Make NetworkCapabilities.NOT_VPN javadoc visible." into m-wireless-dev
Zach Riggle [Thu, 19 Mar 2015 23:40:33 +0000 (23:40 +0000)]
am
901e4008: am
a6e7a9b5: am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
automerge:
630ff31
* commit '
630ff318727280fc55eb2ed69019ed43f1802c93':
Fix NPE in FlashlightController
Zach Riggle [Thu, 19 Mar 2015 23:29:18 +0000 (23:29 +0000)]
am
901e4008: am
a6e7a9b5: am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
901e400826e76f0eaa9d05cca20c1696bf86db67':
Fix NPE in FlashlightController
Zach Riggle [Thu, 19 Mar 2015 23:22:10 +0000 (23:22 +0000)]
am
a6e7a9b5: am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
a6e7a9b50d0866fac57447496e4207d91c68c806':
Fix NPE in FlashlightController
Zach Riggle [Thu, 19 Mar 2015 23:15:02 +0000 (23:15 +0000)]
am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
Fix NPE in FlashlightController
Zach Riggle [Thu, 19 Mar 2015 23:09:31 +0000 (23:09 +0000)]
Merge "Fix NPE in FlashlightController" into lmp-dev
smain@google.com [Thu, 19 Mar 2015 22:53:11 +0000 (22:53 +0000)]
am
d5fdc287: am
3bc84b18: am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
automerge:
fa7c8e3
* commit '
fa7c8e3c805a06062b0c44af51e09b8bb381a810':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:41:42 +0000 (22:41 +0000)]
am
d5fdc287: am
3bc84b18: am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
d5fdc2870079876cd5d8407773aa73225a12c044':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:35:16 +0000 (22:35 +0000)]
am
3bc84b18: am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
3bc84b18b74cd14d98c81ea263b3ca49549a590c':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:29:09 +0000 (22:29 +0000)]
am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
910ca415587c6b7f7a004cc381c36352c021c12b':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:22:10 +0000 (22:22 +0000)]
am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:16:11 +0000 (22:16 +0000)]
Merge "add Places API to the Location feature page" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 20:54:48 +0000 (20:54 +0000)]
am
bb777ef4: am
b88bce21: am
c773358d: am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
automerge:
0c8493b
* commit '
0c8493baba146c09f482430090d22cd1073288f2':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 20:54:40 +0000 (20:54 +0000)]
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
automerge:
061c8d5
* commit '
061c8d576c94950b856eca4b20f4f522f13c53f9':
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:54:29 +0000 (20:54 +0000)]
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
automerge:
3b2d4cd
* commit '
3b2d4cdb2e3fa2ee04589559db5f3fb24d12a29e':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
Eric Gilmore [Thu, 19 Mar 2015 20:44:57 +0000 (20:44 +0000)]
am
1f07cfb6: am
0fdeefbd: am
cf1586d3: am
e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
automerge:
e91e0be
* commit '
e91e0bec9e36b8d7062fe33ad5bf282916421f8d':
Changes for a quick, pre-migration bug sprint:
Joe Fernandez [Thu, 19 Mar 2015 20:42:19 +0000 (20:42 +0000)]
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:42:15 +0000 (20:42 +0000)]
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:42:10 +0000 (20:42 +0000)]
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:35:09 +0000 (20:35 +0000)]
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:35:05 +0000 (20:35 +0000)]
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:34:59 +0000 (20:34 +0000)]
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.""
Eric Gilmore [Thu, 19 Mar 2015 20:31:36 +0000 (20:31 +0000)]
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:
Joe Fernandez [Thu, 19 Mar 2015 20:28:54 +0000 (20:28 +0000)]
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:28:45 +0000 (20:28 +0000)]
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:28:40 +0000 (20:28 +0000)]
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.""
Eric Gilmore [Thu, 19 Mar 2015 20:24:57 +0000 (20:24 +0000)]
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:
Joe Fernandez [Thu, 19 Mar 2015 20:21:47 +0000 (20:21 +0000)]
am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
* commit '
dd461b298834d7582a98a69c164fe1e3b63c81b9':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 20:21:43 +0000 (20:21 +0000)]
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.""
Joe Fernandez [Thu, 19 Mar 2015 20:21:37 +0000 (20:21 +0000)]
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.""
Eric Gilmore [Thu, 19 Mar 2015 20:17:22 +0000 (20:17 +0000)]
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:
Joe Fernandez [Thu, 19 Mar 2015 20:16:31 +0000 (20:16 +0000)]
Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 20:16:20 +0000 (20:16 +0000)]
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
Joe Fernandez [Thu, 19 Mar 2015 20:16:03 +0000 (20:16 +0000)]
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
Rich Slogar [Thu, 19 Mar 2015 20:12:03 +0000 (20:12 +0000)]
am
983dd1a9: am
b569ec3c: am
d76aa14c: am
d5885842: Merge "docs: proguard help update" into lmp-docs
automerge:
2e09cf5
* commit '
2e09cf5a932c0cf1059979989519be2824abdc87':
docs: proguard help update
Eric Gilmore [Thu, 19 Mar 2015 20:10:55 +0000 (20:10 +0000)]
am
e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
* commit '
e43a64e3336548094571885944afc28792e24fa0':
Changes for a quick, pre-migration bug sprint:
Eric Gilmore [Thu, 19 Mar 2015 20:05:49 +0000 (20:05 +0000)]
Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:54:10 +0000 (19:54 +0000)]
am
983dd1a9: am
b569ec3c: am
d76aa14c: am
d5885842: Merge "docs: proguard help update" into lmp-docs
* commit '
983dd1a9d1dc5a6d0bc72fcbc87b5194df09c048':
docs: proguard help update
Rich Slogar [Thu, 19 Mar 2015 19:47:03 +0000 (19:47 +0000)]
am
b569ec3c: am
d76aa14c: am
d5885842: Merge "docs: proguard help update" into lmp-docs
* commit '
b569ec3cc1366e3e3caa96fa40a9fc14ed9c6121':
docs: proguard help update
Rich Slogar [Thu, 19 Mar 2015 19:39:27 +0000 (19:39 +0000)]
am
d76aa14c: am
d5885842: Merge "docs: proguard help update" into lmp-docs
* commit '
d76aa14cf401ca794b585b2312528121c651a537':
docs: proguard help update
Rich Slogar [Thu, 19 Mar 2015 19:10:06 +0000 (19:10 +0000)]
am
d5885842: Merge "docs: proguard help update" into lmp-docs
* commit '
d58858427e102bec7ebe1d2a8ce418529924a68c':
docs: proguard help update
Rich Slogar [Thu, 19 Mar 2015 19:04:04 +0000 (19:04 +0000)]
Merge "docs: proguard help update" into lmp-docs
Andres Morales [Thu, 19 Mar 2015 18:42:28 +0000 (18:42 +0000)]
am
c8f952ce: Write correct checksum when formatting partition
automerge:
5e00534
* commit '
5e00534caaddbe5034f07dedce66cd9c5d986c8d':
Write correct checksum when formatting partition
Joe Fernandez [Thu, 19 Mar 2015 18:32:50 +0000 (18:32 +0000)]
am
cbdfa09f: am
f8b9e92b: am
ae454257: am
b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
automerge:
14f58ea
* commit '
14f58eacfd42c4c065d22f2a084236b18c094fb3':
docs: updated Auto training landing page
Joe Fernandez [Thu, 19 Mar 2015 18:32:38 +0000 (18:32 +0000)]
am
2e0f6b10: am
9bb7e2e7: am
f23167fc: am
4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
automerge:
11cf6c1
* commit '
11cf6c11691b0c6af4aeabdc05b8300f5fb37915':
Revert "Doc change: add docs for SafetyNet API."
Joe Fernandez [Thu, 19 Mar 2015 18:32:29 +0000 (18:32 +0000)]
am
1e474aee: am
1eba366d: am
507cfedd: am
5a5e6a37: Merge "Revert "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
automerge:
bb0ce12
* commit '
bb0ce124cf4e100154506402b42bcd0c469eaace':
Revert "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."
Joe Fernandez [Thu, 19 Mar 2015 18:32:20 +0000 (18:32 +0000)]
am
6f3caae9: am
055ec1f9: am
f7497b46: am
ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."" into lmp-docs
automerge:
98b20e0
* commit '
98b20e0a8a9464058d70a6b5f27783eb977a6bd9':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."
Joe Fernandez [Thu, 19 Mar 2015 18:31:58 +0000 (18:31 +0000)]
am
5994206b: am
cdf13080: am
ed657981: am
59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs
automerge:
264c0a0
* commit '
264c0a037dd1d438b4850b94f3b9954edf5c609e':
cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
Joe Fernandez [Thu, 19 Mar 2015 18:31:49 +0000 (18:31 +0000)]
am
cd9cd187: am
e31c9048: am
462dc7b9: am
cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs
automerge:
658bd99
* commit '
658bd99de23e677754926497f02d49136e3cd814':
docs: Add distribution guidelines and update quality checklist for Android Auto.
Joe Fernandez [Thu, 19 Mar 2015 18:31:40 +0000 (18:31 +0000)]
am
348a8b85: am
d2484a8a: am
26e332bf: am
3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs
automerge:
2f4f41e
* commit '
2f4f41e12de860804e9a069e8feae1e677cbb461':
Doc change: add docs for SafetyNet API.
Quddus Chong [Thu, 19 Mar 2015 18:31:31 +0000 (18:31 +0000)]
am
e5856e6b: am
c63471ad: am
51aa424a: am
9b278f56: Merge "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
automerge:
a0c9b53
* commit '
a0c9b538caac4cf4eec06abaa99ea3f28ec7163f':
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.
Quddus Chong [Thu, 19 Mar 2015 18:31:21 +0000 (18:31 +0000)]
am
48612f9d: am
5192ac8d: am
f990241a: am
abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785." into lmp-docs
automerge:
3367fd2
* commit '
3367fd2aaee750d200e0683ca45b62a455c2e1e9':
docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.
Andrew Solovay [Thu, 19 Mar 2015 18:31:08 +0000 (18:31 +0000)]
am
b08f2078: am
3f7f78c6: am
27853819: am
78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs
automerge:
3852906
* commit '
385290601489f63e413b7d021d117f175174ee65':
docs: Removed sentence fragments.
Andrew Solovay [Thu, 19 Mar 2015 18:30:59 +0000 (18:30 +0000)]
am
cf34a6d1: am
46bda6a4: am
6fd36f11: am
ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
automerge:
7a98f83
* commit '
7a98f832dc01671b8acc128b01ea87c20595f781':
docs: Fixed typo (spurious quotation mark).
Andrew Solovay [Thu, 19 Mar 2015 18:30:43 +0000 (18:30 +0000)]
am
a0141748: am
42f966c9: am
dbec5ae6: am
0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
automerge:
8973063
* commit '
89730636985c745055671f077514963744e1aeb8':
docs: Fixed broken image link, and broke long lines in code samples
Andres Morales [Thu, 19 Mar 2015 18:27:35 +0000 (18:27 +0000)]
am
c8f952ce: Write correct checksum when formatting partition
* commit '
c8f952ce9f9cadc0d38745e455c0a6388bc68a47':
Write correct checksum when formatting partition
Rich Slogar [Tue, 3 Mar 2015 20:27:16 +0000 (12:27 -0800)]
docs: proguard help update
b/
19383794
b/
19417644
Change-Id: I454015fb85601dbd31d3cb364eaa6d0adee0c764
Andres Morales [Thu, 19 Mar 2015 15:34:55 +0000 (08:34 -0700)]
Write correct checksum when formatting partition
OEM unlock enabled bit is not computed in the checksum,
causing OEM Unlocking to be disabled after the second
reboot.
Bug:
19829441
Change-Id: I100bf5d3958b89323ee35b9e97b19c162209fcd7
Jan Nordqvist [Thu, 19 Mar 2015 17:09:08 +0000 (17:09 +0000)]
Merge "More fixes to get passpoint working" into m-wireless-dev
Joe Fernandez [Thu, 19 Mar 2015 16:39:43 +0000 (16:39 +0000)]
RESUBMIT: "Doc change: add docs for SafetyNet API.""
This reverts commit
1fac8d4800c4cdd0c357b17ad0a271f8f3b4bee0.
Change-Id: Idf3dba195f3e0ccf27103b9f7d7a67cec8c917b0
Joe Fernandez [Thu, 19 Mar 2015 16:38:05 +0000 (16:38 +0000)]
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.""
This reverts commit
2a867108951807e467dbfe0fcd4cc48a4d7f4191.
Change-Id: Ib91bf437e952e8a91f20afc63332b88952527ca4
Joe Fernandez [Thu, 19 Mar 2015 16:36:02 +0000 (16:36 +0000)]
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
This reverts commit
c0e9ac455568b2d82d191388708a281bdb376cc9.
Change-Id: Iccc75ead90c92602b25da70e13bcdd55a6d129b6
John Reck [Thu, 19 Mar 2015 14:31:18 +0000 (14:31 +0000)]
Merge "Fix setSurfaceTexture to handle surface caching" into m-wireless-dev
Paul Jensen [Thu, 19 Mar 2015 12:07:24 +0000 (12:07 +0000)]
Merge "Remove dead code, mostly DataStateTracker." into m-wireless-dev
Joe Fernandez [Thu, 19 Mar 2015 05:44:16 +0000 (05:44 +0000)]
am
cbdfa09f: am
f8b9e92b: am
ae454257: am
b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
* commit '
cbdfa09fc56995c8c99e8684b8c52e4f9d247a50':
docs: updated Auto training landing page
Joe Fernandez [Thu, 19 Mar 2015 05:37:09 +0000 (05:37 +0000)]
am
f8b9e92b: am
ae454257: am
b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
* commit '
f8b9e92b647f247d38e02ed3cf66bdc8cf08bc1c':
docs: updated Auto training landing page
Joe Fernandez [Thu, 19 Mar 2015 05:31:20 +0000 (05:31 +0000)]
am
ae454257: am
b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
* commit '
ae4542578ef50122bb3cd3a8334a20314957e318':
docs: updated Auto training landing page
Joe Fernandez [Thu, 19 Mar 2015 05:24:54 +0000 (05:24 +0000)]
am
2e0f6b10: am
9bb7e2e7: am
f23167fc: am
4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
* commit '
2e0f6b10e2d0a9d1dc8321e4aaedde148a87bc44':
Revert "Doc change: add docs for SafetyNet API."
Joe Fernandez [Thu, 19 Mar 2015 05:24:51 +0000 (05:24 +0000)]
am
1e474aee: am
1eba366d: am
507cfedd: am
5a5e6a37: Merge "Revert "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 '
1e474aeeb55a3d2ff79b6803813ba36469f3a463':
Revert "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."
Joe Fernandez [Thu, 19 Mar 2015 05:24:46 +0000 (05:24 +0000)]
am
6f3caae9: am
055ec1f9: am
f7497b46: am
ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."" into lmp-docs
* commit '
6f3caae9f016666815d6bfc7daa9db13d13b6cef':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."
Joe Fernandez [Thu, 19 Mar 2015 05:23:30 +0000 (05:23 +0000)]
am
b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
* commit '
b67971b512d95d5d9befb9d95417f9c3d8cb3a44':
docs: updated Auto training landing page
Joe Fernandez [Thu, 19 Mar 2015 05:19:21 +0000 (05:19 +0000)]
Merge "docs: updated Auto training landing page" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:18:15 +0000 (05:18 +0000)]
am
9bb7e2e7: am
f23167fc: am
4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
* commit '
9bb7e2e77c6b8dd3d729cddf23194142cf1035e4':
Revert "Doc change: add docs for SafetyNet API."
Joe Fernandez [Thu, 19 Mar 2015 05:18:01 +0000 (05:18 +0000)]
am
1eba366d: am
507cfedd: am
5a5e6a37: Merge "Revert "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 '
1eba366dce4b38e849e9faaf99c5bd3f7de2d6a8':
Revert "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."
Joe Fernandez [Thu, 19 Mar 2015 05:17:54 +0000 (05:17 +0000)]
am
055ec1f9: am
f7497b46: am
ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."" into lmp-docs
* commit '
055ec1f94f90bd3f87e0b48d5438953420b22c3f':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."
Joe Fernandez [Thu, 19 Mar 2015 05:11:27 +0000 (05:11 +0000)]
am
f23167fc: am
4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
* commit '
f23167fc8faa03f16a5597acb463393a5ec14af5':
Revert "Doc change: add docs for SafetyNet API."
Joe Fernandez [Thu, 19 Mar 2015 05:11:23 +0000 (05:11 +0000)]
am
507cfedd: am
5a5e6a37: Merge "Revert "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 '
507cfedde978dea45cc646fd391c5a12ff55e9cd':
Revert "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."
Joe Fernandez [Thu, 19 Mar 2015 05:11:18 +0000 (05:11 +0000)]
am
f7497b46: am
ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."" into lmp-docs
* commit '
f7497b46366054274eca1a81e7f74b0e61d7ffe5':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."
Joe Fernandez [Sat, 7 Mar 2015 00:08:13 +0000 (16:08 -0800)]
docs: updated Auto training landing page
Change-Id: I407681892071b82523c5533539c777f77a8dd429
Joe Fernandez [Thu, 19 Mar 2015 05:05:08 +0000 (05:05 +0000)]
am
4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
* commit '
4189bd99572a8dfa4a84e05a03a6d87d794d2e36':
Revert "Doc change: add docs for SafetyNet API."
Joe Fernandez [Thu, 19 Mar 2015 05:05:04 +0000 (05:05 +0000)]
am
5a5e6a37: Merge "Revert "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 '
5a5e6a37011795135b7ebbaf4ae5645d72f8f147':
Revert "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."
Joe Fernandez [Thu, 19 Mar 2015 05:04:58 +0000 (05:04 +0000)]
am
ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."" into lmp-docs
* commit '
ceb10eac8ec07be00a3eca68ea1be68cb5ebc78c':
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."
Wei Wang [Thu, 19 Mar 2015 05:02:09 +0000 (05:02 +0000)]
Merge "Make Opportunistic Scan API public." into m-wireless-dev
Joe Fernandez [Thu, 19 Mar 2015 05:00:45 +0000 (05:00 +0000)]
Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:00:03 +0000 (05:00 +0000)]
Merge "Revert "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
Joe Fernandez [Thu, 19 Mar 2015 04:58:17 +0000 (04:58 +0000)]
Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 04:55:05 +0000 (04:55 +0000)]
Revert "Doc change: add docs for SafetyNet API."
Reason: Android Auto needs to release ahead of Orla which is delayed.
This change is in the way, right now, but will be re-submitted.
This reverts commit
11e80575660e81d7e053d7fce604bf421ca2f3ce.
Change-Id: I6661e1e780ce8aee9bdaed82fcff4f96fc3349e7
Joe Fernandez [Thu, 19 Mar 2015 04:51:17 +0000 (04:51 +0000)]
Revert "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."
This reverts commit
b2a6185e259c2e9bbb48d729563263cf7234a837.
Change-Id: I64f49cba3a87fe0f6a9db12a68d8a0064810a1d8
Joe Fernandez [Thu, 19 Mar 2015 04:49:40 +0000 (04:49 +0000)]
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785."
This reverts commit
180b835480b113e497268243a12cb2c244d9559e.
Change-Id: Ibcefe65a1a7829b8b424763aba636300665a7f7b
Bart Sears [Thu, 19 Mar 2015 02:58:59 +0000 (02:58 +0000)]
am
c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
automerge:
dd985c2
* commit '
dd985c21dd4f5957e8d6e052976623d127e8f090':
Prevent activities from being started during setup wizard.
OSDN Git Service
