OSDN Git Service
Erik Kline [Tue, 17 Mar 2015 23:08:57 +0000 (08:08 +0900)]
Fix missing printf argument.
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
Nicolas Prevot [Mon, 16 Mar 2015 11:25:50 +0000 (11:25 +0000)]
Merge "Remove the owner userid of cross-profile intent filters."
Vinit Deshpande [Sun, 15 Mar 2015 19:57:42 +0000 (12:57 -0700)]
Fixing build after merge from mirror-m-wireless-internal-release
There have been few breaking changes
1. TelecomManager.getCallCapablePhoneAccounts is not hidden anymore
2. CAPABILITY_VIDEO_CALLING is not hidden anymore
3. mPhoneStateListener doesn't exist anymore, so it is commented out
Change-Id: I22221eda73a20c745e316d9d56f914ab17b83533
Vinit Deshpande [Sun, 15 Mar 2015 20:44:36 +0000 (13:44 -0700)]
am "am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. automerge:
c984826"
merged from goog/mirror-m-wireless-internal-release
1ef2b92 am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. automerge:
c984826
Vinit Deshpande [Sun, 15 Mar 2015 20:44:35 +0000 (13:44 -0700)]
am "am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list."
merged from goog/mirror-m-wireless-internal-release
c984826 am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
Vinit Deshpande [Sun, 15 Mar 2015 20:44:34 +0000 (13:44 -0700)]
am "am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev automerge:
713e7cc"
merged from goog/mirror-m-wireless-internal-release
fbabcb0 am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev automerge:
713e7cc
Vinit Deshpande [Sun, 15 Mar 2015 20:44:33 +0000 (13:44 -0700)]
am "am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs automerge:
3a5a410"
merged from goog/mirror-m-wireless-internal-release
d5e957c am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs automerge:
3a5a410
Vinit Deshpande [Sun, 15 Mar 2015 20:44:32 +0000 (13:44 -0700)]
am "am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
713e7cc am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:44:31 +0000 (13:44 -0700)]
am "am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev automerge:
5c69ca2"
merged from goog/mirror-m-wireless-internal-release
2561d87 am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev automerge:
5c69ca2
Vinit Deshpande [Sun, 15 Mar 2015 20:44:30 +0000 (13:44 -0700)]
am "am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge:
49d3c36"
merged from goog/mirror-m-wireless-internal-release
ad04942 am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge:
49d3c36
Vinit Deshpande [Sun, 15 Mar 2015 20:44:29 +0000 (13:44 -0700)]
am "am
71518174: Merge "Fix project settings." into lmp-mr1-dev automerge:
4abf088"
merged from goog/mirror-m-wireless-internal-release
746db9c am
71518174: Merge "Fix project settings." into lmp-mr1-dev automerge:
4abf088
Vinit Deshpande [Sun, 15 Mar 2015 20:44:28 +0000 (13:44 -0700)]
am "am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev automerge:
26f672a"
merged from goog/mirror-m-wireless-internal-release
4f221f0 am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev automerge:
26f672a
Vinit Deshpande [Sun, 15 Mar 2015 20:44:26 +0000 (13:44 -0700)]
am "am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
3a5a410 am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:44:25 +0000 (13:44 -0700)]
am "am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev"
merged from goog/mirror-m-wireless-internal-release
5c69ca2 am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:44:24 +0000 (13:44 -0700)]
am "am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs automerge:
766889e"
merged from goog/mirror-m-wireless-internal-release
3be3344 am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs automerge:
766889e
Vinit Deshpande [Sun, 15 Mar 2015 20:44:23 +0000 (13:44 -0700)]
am "am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
49d3c36 am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:44:22 +0000 (13:44 -0700)]
am "am
71518174: Merge "Fix project settings." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
4abf088 am
71518174: Merge "Fix project settings." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:44:21 +0000 (13:44 -0700)]
am "am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
26f672a am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:44:20 +0000 (13:44 -0700)]
am "am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
766889e am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:44:19 +0000 (13:44 -0700)]
am "Fix emergency callback number not shown for incoming calls."
merged from goog/mirror-m-wireless-internal-release
068085b Fix emergency callback number not shown for incoming calls.
Vinit Deshpande [Sun, 15 Mar 2015 20:44:17 +0000 (13:44 -0700)]
am "am
dd7d025b: am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs automerge:
e32c162"
merged from goog/mirror-m-wireless-internal-release
86d4da3 am
dd7d025b: am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs automerge:
e32c162
Vinit Deshpande [Sun, 15 Mar 2015 20:44:16 +0000 (13:44 -0700)]
am "am
dd7d025b: am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
e32c162 am
dd7d025b: am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:44:15 +0000 (13:44 -0700)]
am "Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
74050f5 Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:44:14 +0000 (13:44 -0700)]
am "am
50a9b835: am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs automerge:
b0422a4"
merged from goog/mirror-m-wireless-internal-release
52def6d am
50a9b835: am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs automerge:
b0422a4
Vinit Deshpande [Sun, 15 Mar 2015 20:44:13 +0000 (13:44 -0700)]
am "am
8ab872db: am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs automerge:
709e9a8"
merged from goog/mirror-m-wireless-internal-release
b55db05 am
8ab872db: am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs automerge:
709e9a8
Vinit Deshpande [Sun, 15 Mar 2015 20:44:12 +0000 (13:44 -0700)]
am "am
a493c489: am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" automerge:
baf3451"
merged from goog/mirror-m-wireless-internal-release
d9a99e0 am
a493c489: am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" automerge:
baf3451
Vinit Deshpande [Sun, 15 Mar 2015 20:44:11 +0000 (13:44 -0700)]
am "am
50a9b835: am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
b0422a4 am
50a9b835: am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:44:10 +0000 (13:44 -0700)]
am "am
8ab872db: am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
709e9a8 am
8ab872db: am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:44:09 +0000 (13:44 -0700)]
am "am
a493c489: am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto""
merged from goog/mirror-m-wireless-internal-release
baf3451 am
a493c489: am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
Vinit Deshpande [Sun, 15 Mar 2015 20:44:07 +0000 (13:44 -0700)]
am "Helper methods for voicemail status provider."
merged from goog/mirror-m-wireless-internal-release
8b97ee3 Helper methods for voicemail status provider.
Vinit Deshpande [Sun, 15 Mar 2015 20:44:05 +0000 (13:44 -0700)]
am "Indicate local and remote RX/TX capabilities for VT."
merged from goog/mirror-m-wireless-internal-release
5e9e8bb Indicate local and remote RX/TX capabilities for VT.
Vinit Deshpande [Sun, 15 Mar 2015 20:44:04 +0000 (13:44 -0700)]
am "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev automerge:
8b438c8"
merged from goog/mirror-m-wireless-internal-release
4a2ca9d Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev automerge:
8b438c8
Vinit Deshpande [Sun, 15 Mar 2015 20:44:03 +0000 (13:44 -0700)]
am "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev"
merged from goog/mirror-m-wireless-internal-release
8b438c8 Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:44:01 +0000 (13:44 -0700)]
am "Add missing system-api.txt for RTT API changes"
merged from goog/mirror-m-wireless-internal-release
93e314e Add missing system-api.txt for RTT API changes
Vinit Deshpande [Sun, 15 Mar 2015 20:44:00 +0000 (13:44 -0700)]
am "am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerge:
9462a93"
merged from goog/mirror-m-wireless-internal-release
1123a3e am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerge:
9462a93
Vinit Deshpande [Sun, 15 Mar 2015 20:43:59 +0000 (13:43 -0700)]
am "am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
9462a93 am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:43:58 +0000 (13:43 -0700)]
am "Few changes to make API check happy [DO NOT MERGE]"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:43:57 +0000 (13:43 -0700)]
am "am "add 2 side RTT support on scan""
merged from goog/mirror-m-wireless-internal-release
0019e53 am "add 2 side RTT support on scan"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:55 +0000 (13:43 -0700)]
am "am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev""
merged from goog/mirror-m-wireless-internal-release
bc93466 am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:53 +0000 (13:43 -0700)]
am "am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev""
merged from goog/mirror-m-wireless-internal-release
4300ac4 am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:52 +0000 (13:43 -0700)]
am "am "Passpoint API - Take 1""
merged from goog/mirror-m-wireless-internal-release
d2585f3 am "Passpoint API - Take 1"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:50 +0000 (13:43 -0700)]
am "am "Do not provide 5GHz option for softap if there is no country code available""
merged from goog/mirror-m-wireless-internal-release
e959443 am "Do not provide 5GHz option for softap if there is no country code available"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:50 +0000 (13:43 -0700)]
am "am "Introduce onLost event on bssid hotlist [DO NOT MERGE]""
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:43:48 +0000 (13:43 -0700)]
am "am "get channel list from driver for SoftAP channel selection""
merged from goog/mirror-m-wireless-internal-release
3cb5e4d am "get channel list from driver for SoftAP channel selection"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:47 +0000 (13:43 -0700)]
am "am "Revert "Initial Passpoint code."""
merged from goog/mirror-m-wireless-internal-release
76f9ace am "Revert "Initial Passpoint code.""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:45 +0000 (13:43 -0700)]
am "am "Initial Passpoint code.""
merged from goog/mirror-m-wireless-internal-release
29267b6 am "Initial Passpoint code."
Vinit Deshpande [Sun, 15 Mar 2015 20:43:43 +0000 (13:43 -0700)]
am "am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev""
merged from goog/mirror-m-wireless-internal-release
f0bfa91 am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:42 +0000 (13:43 -0700)]
am "am "set softAP on a specified band, including both 2.4 and 5 GHz band""
merged from goog/mirror-m-wireless-internal-release
b4499af am "set softAP on a specified band, including both 2.4 and 5 GHz band"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:41 +0000 (13:43 -0700)]
am "am "Bring in passpoint code [DO NOT MERGE]""
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:43:40 +0000 (13:43 -0700)]
am "am "New Additions to WifiScanner APIs [DO NOT MERGE]""
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:43:38 +0000 (13:43 -0700)]
am "Add strings for IMS Registration error notifications."
merged from goog/mirror-m-wireless-internal-release
36d96e0 Add strings for IMS Registration error notifications.
Vinit Deshpande [Sun, 15 Mar 2015 20:43:37 +0000 (13:43 -0700)]
am "am
5a604b35: am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs automerge:
011f5ce"
merged from goog/mirror-m-wireless-internal-release
81e1b71 am
5a604b35: am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs automerge:
011f5ce
Vinit Deshpande [Sun, 15 Mar 2015 20:43:36 +0000 (13:43 -0700)]
am "am
5a604b35: am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
011f5ce am
5a604b35: am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:43:35 +0000 (13:43 -0700)]
am "am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs automerge:
142e90e"
merged from goog/mirror-m-wireless-internal-release
e6dc1a9 am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs automerge:
142e90e
Vinit Deshpande [Sun, 15 Mar 2015 20:43:34 +0000 (13:43 -0700)]
am "Update documentation of IImsConfig interface. automerge:
796d60b"
merged from goog/mirror-m-wireless-internal-release
b565b79 Update documentation of IImsConfig interface. automerge:
796d60b
Vinit Deshpande [Sun, 15 Mar 2015 20:43:33 +0000 (13:43 -0700)]
am "am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
142e90e am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:43:32 +0000 (13:43 -0700)]
am "Update documentation of IImsConfig interface."
merged from goog/mirror-m-wireless-internal-release
796d60b Update documentation of IImsConfig interface.
Vinit Deshpande [Sun, 15 Mar 2015 20:43:30 +0000 (13:43 -0700)]
am "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev automerge:
2f23212"
merged from goog/mirror-m-wireless-internal-release
6c70b49 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev automerge:
2f23212
Vinit Deshpande [Sun, 15 Mar 2015 20:43:29 +0000 (13:43 -0700)]
am "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev"
merged from goog/mirror-m-wireless-internal-release
2f23212 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:43:28 +0000 (13:43 -0700)]
am "IMS: Support for IMS Registration error codes"
merged from goog/mirror-m-wireless-internal-release
b54d218 IMS: Support for IMS Registration error codes
Vinit Deshpande [Sun, 15 Mar 2015 20:43:27 +0000 (13:43 -0700)]
am "am
39d47c7c: am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs automerge:
df5651d"
merged from goog/mirror-m-wireless-internal-release
e4112b7 am
39d47c7c: am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs automerge:
df5651d
Vinit Deshpande [Sun, 15 Mar 2015 20:43:26 +0000 (13:43 -0700)]
am "am
39d47c7c: am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
df5651d am
39d47c7c: am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:43:25 +0000 (13:43 -0700)]
am "am
4c0b2345: am
8f9ae232: am
36d008c5: am
5afdc97f: Fix USB typos automerge:
32ee913"
merged from goog/mirror-m-wireless-internal-release
2f4f522 am
4c0b2345: am
8f9ae232: am
36d008c5: am
5afdc97f: Fix USB typos automerge:
32ee913
Vinit Deshpande [Sun, 15 Mar 2015 20:43:24 +0000 (13:43 -0700)]
am "am
4c0b2345: am
8f9ae232: am
36d008c5: am
5afdc97f: Fix USB typos"
merged from goog/mirror-m-wireless-internal-release
32ee913 am
4c0b2345: am
8f9ae232: am
36d008c5: am
5afdc97f: Fix USB typos
Vinit Deshpande [Sun, 15 Mar 2015 20:43:23 +0000 (13:43 -0700)]
am "am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev automerge:
701d816"
merged from goog/mirror-m-wireless-internal-release
2a23382 am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev automerge:
701d816
Vinit Deshpande [Sun, 15 Mar 2015 20:43:21 +0000 (13:43 -0700)]
am "am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
701d816 am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:43:20 +0000 (13:43 -0700)]
am "Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
ddbf13d Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:43:19 +0000 (13:43 -0700)]
am "am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs automerge:
ac35ad3"
merged from goog/mirror-m-wireless-internal-release
5bd0d33 am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs automerge:
ac35ad3
Vinit Deshpande [Sun, 15 Mar 2015 20:43:11 +0000 (13:43 -0700)]
am "Hide calllog entries for unregistered phone accounts"
merged from goog/mirror-m-wireless-internal-release
2d2bc16 Hide calllog entries for unregistered phone accounts
Change-Id: I39b60b86fca9c1b74d750ab251cc26b3ce5f5650
Vinit Deshpande [Sun, 15 Mar 2015 20:42:51 +0000 (13:42 -0700)]
am "am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
ac35ad3 am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:42:50 +0000 (13:42 -0700)]
am "am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix automerge:
06a22af"
merged from goog/mirror-m-wireless-internal-release
9674014 am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix automerge:
06a22af
Vinit Deshpande [Sun, 15 Mar 2015 20:42:49 +0000 (13:42 -0700)]
am "am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix"
merged from goog/mirror-m-wireless-internal-release
06a22af am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
Vinit Deshpande [Sun, 15 Mar 2015 20:42:48 +0000 (13:42 -0700)]
am "Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
1c55b90 Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:47 +0000 (13:42 -0700)]
am "am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs automerge:
ee314cf"
merged from goog/mirror-m-wireless-internal-release
bb33ce8 am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs automerge:
ee314cf
Vinit Deshpande [Sun, 15 Mar 2015 20:42:46 +0000 (13:42 -0700)]
am "am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
ee314cf am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:42:44 +0000 (13:42 -0700)]
am "Enable Ethernet if the device has FEATURE_USB_HOST."
merged from goog/mirror-m-wireless-internal-release
f4f93b2 Enable Ethernet if the device has FEATURE_USB_HOST.
Vinit Deshpande [Sun, 15 Mar 2015 20:42:43 +0000 (13:42 -0700)]
am "am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs automerge:
5890742"
merged from goog/mirror-m-wireless-internal-release
6657dd3 am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs automerge:
5890742
Vinit Deshpande [Sun, 15 Mar 2015 20:42:42 +0000 (13:42 -0700)]
am "am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
5890742 am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:42:41 +0000 (13:42 -0700)]
am "am
4eedcceb: Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev automerge:
3797ee9"
merged from goog/mirror-m-wireless-internal-release
7ddec30 am
4eedcceb: Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev automerge:
3797ee9
Vinit Deshpande [Sun, 15 Mar 2015 20:42:40 +0000 (13:42 -0700)]
am "am
4eedcceb: Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
3797ee9 am
4eedcceb: Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:38 +0000 (13:42 -0700)]
am "add 2 side RTT support on scan"
merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan
Vinit Deshpande [Sun, 15 Mar 2015 20:42:37 +0000 (13:42 -0700)]
am "am
c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge:
d3c532e"
merged from goog/mirror-m-wireless-internal-release
73cb967 am
c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge:
d3c532e
Vinit Deshpande [Sun, 15 Mar 2015 20:42:36 +0000 (13:42 -0700)]
am "am
c974ac11: MediaProjectionPermissionActivity: Fix NPE."
merged from goog/mirror-m-wireless-internal-release
d3c532e am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
Vinit Deshpande [Sun, 15 Mar 2015 20:42:35 +0000 (13:42 -0700)]
am "am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge:
9a447bc"
merged from goog/mirror-m-wireless-internal-release
2782f31 am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge:
9a447bc
Vinit Deshpande [Sun, 15 Mar 2015 20:42:34 +0000 (13:42 -0700)]
am "am
a81ed3cd: docs: support library updates for sdk 22 automerge:
7a3dc08"
merged from goog/mirror-m-wireless-internal-release
2444690 am
a81ed3cd: docs: support library updates for sdk 22 automerge:
7a3dc08
Vinit Deshpande [Sun, 15 Mar 2015 20:42:33 +0000 (13:42 -0700)]
am "am
e0ce0f2c: docs: platform revisions 5.1 automerge:
7de9d3b"
merged from goog/mirror-m-wireless-internal-release
c3b5768 am
e0ce0f2c: docs: platform revisions 5.1 automerge:
7de9d3b
Vinit Deshpande [Sun, 15 Mar 2015 20:42:32 +0000 (13:42 -0700)]
am "am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge:
a5587b9"
merged from goog/mirror-m-wireless-internal-release
63751cf am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge:
a5587b9
Vinit Deshpande [Sun, 15 Mar 2015 20:42:31 +0000 (13:42 -0700)]
am "am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge:
0a1d5ca"
merged from goog/mirror-m-wireless-internal-release
91572ab am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge:
0a1d5ca
Vinit Deshpande [Sun, 15 Mar 2015 20:42:30 +0000 (13:42 -0700)]
am "am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge:
b068c14"
merged from goog/mirror-m-wireless-internal-release
0764a8b am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge:
b068c14
Vinit Deshpande [Sun, 15 Mar 2015 20:42:29 +0000 (13:42 -0700)]
am "am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge:
287f257"
merged from goog/mirror-m-wireless-internal-release
6e3276c am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge:
287f257
Vinit Deshpande [Sun, 15 Mar 2015 20:42:28 +0000 (13:42 -0700)]
am "am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge:
622c011"
merged from goog/mirror-m-wireless-internal-release
46d48f9 am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge:
622c011
Vinit Deshpande [Sun, 15 Mar 2015 20:42:27 +0000 (13:42 -0700)]
am "am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
9a447bc am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:42:25 +0000 (13:42 -0700)]
am "am
a81ed3cd: docs: support library updates for sdk 22"
merged from goog/mirror-m-wireless-internal-release
7a3dc08 am
a81ed3cd: docs: support library updates for sdk 22
Vinit Deshpande [Sun, 15 Mar 2015 20:42:24 +0000 (13:42 -0700)]
am "am
e0ce0f2c: docs: platform revisions 5.1"
merged from goog/mirror-m-wireless-internal-release
7de9d3b am
e0ce0f2c: docs: platform revisions 5.1
Vinit Deshpande [Sun, 15 Mar 2015 20:42:23 +0000 (13:42 -0700)]
am "am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
a5587b9 am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:22 +0000 (13:42 -0700)]
am "am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
0a1d5ca am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:21 +0000 (13:42 -0700)]
am "am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
b068c14 am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:42:20 +0000 (13:42 -0700)]
am "am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
287f257 am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:19 +0000 (13:42 -0700)]
am "am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
622c011 am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:17 +0000 (13:42 -0700)]
am "Correct "Sign-in" and "Sign into" to "Sign in to"."
merged from goog/mirror-m-wireless-internal-release
44f7239 Correct "Sign-in" and "Sign into" to "Sign in to".
OSDN Git Service
