OSDN Git Service
Jean-Michel Bachot [Thu, 11 Dec 2014 19:04:20 +0000 (20:04 +0100)]
EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods
EAP-AKA' is a new hidden method
Change-Id: Ic103b25ad58807eebd5e0f8eefe3bfc02397aedc
Signed-off-by: Jean-Michel Bachot <jean-michel.bachot@intel.com>
Signed-off-by: Abdelmajid MLAYEH <abdelmajidx.mlayeh@intel.com>
Pierre Vandwalle [Wed, 25 Mar 2015 02:43:53 +0000 (02:43 +0000)]
Merge "add wifi config for power calculation" into m-wireless-dev
Pierre Vandwalle [Mon, 23 Mar 2015 01:50:40 +0000 (18:50 -0700)]
add wifi config for power calculation
Change-Id: Ic312ffeb299d199547cc75bc6977140f8e6e5f7b
Deepanshu Gupta [Wed, 25 Mar 2015 00:21:27 +0000 (00:21 +0000)]
am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
automerge:
56789fd
* commit '
56789fdb1a90075845c96536658ba501415b9633':
Update JRE for runConfigurations.
Deepanshu Gupta [Wed, 25 Mar 2015 00:21:20 +0000 (00:21 +0000)]
am
dbb38b30: (-s ours) am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
automerge:
5906563 -s ours
* commit '
590656314faa267aba787102fd7c673e25710039':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Wed, 25 Mar 2015 00:21:11 +0000 (00:21 +0000)]
am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
automerge:
92d46e5
* commit '
92d46e594b11cd9abec541bfb5c59267b5e9c540':
Fix RoundRect radius.
Deepanshu Gupta [Wed, 25 Mar 2015 00:21:04 +0000 (00:21 +0000)]
am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
automerge:
5f77229
* commit '
5f7722991ec80a4f93083cef6525ccc75221a9d0':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 25 Mar 2015 00:20:56 +0000 (00:20 +0000)]
am
6fa9d554: am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
automerge:
43091cb
* commit '
43091cbd204c7b563df5d9771e36a429c5e78c5f':
Better shadows.
Deepanshu Gupta [Wed, 25 Mar 2015 00:20:48 +0000 (00:20 +0000)]
am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
automerge:
360ac6f
* commit '
360ac6f5610598eb6a841f285a3c42dc72198475':
Fix layoutlib tests.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:31 +0000 (00:08 +0000)]
am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
862f5900e8abce1cc20979a4dca76e1f0b982880':
Update JRE for runConfigurations.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:28 +0000 (00:08 +0000)]
am
dbb38b30: (-s ours) am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
dbb38b30612dc054ba3bf066f8528cccfceb47ad':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:23 +0000 (00:08 +0000)]
am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
e97079d97a5c914d06c24cb9deda1da9bea88aeb':
Fix RoundRect radius.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:09 +0000 (00:08 +0000)]
am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
2b98abde26aa2033562b48d635d6f2ba11c48908':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:05 +0000 (00:08 +0000)]
am
6fa9d554: am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
6fa9d5546fa27665de3f64564897a77735b2a1b0':
Better shadows.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:01 +0000 (00:08 +0000)]
am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
5bc625d83d60fbb27ab2297051971be91fb3e415':
Fix layoutlib tests.
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:18 +0000 (00:02 +0000)]
am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
44b5a1c8471ef5e1cd3dcfffec5a9e439f228766':
Update JRE for runConfigurations.
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:06 +0000 (00:02 +0000)]
am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
cbb4ec78675c8179cdedafba1972ac062844c70a':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:58 +0000 (00:01 +0000)]
am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
a16bb347e120ba17e87f33ff0364380211d01baf':
Fix RoundRect radius.
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:53 +0000 (00:01 +0000)]
am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:49 +0000 (00:01 +0000)]
am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
0b76cf6ff56c59a04783714d40163576e3081cf1':
Better shadows.
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:43 +0000 (00:01 +0000)]
am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
a62a18e341180ccf6f5379a7d753584f6cee2e7c':
Fix layoutlib tests.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:18 +0000 (23:55 +0000)]
am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
e541f35055709ec43407649b8517639ff00e42d6':
Update JRE for runConfigurations.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:14 +0000 (23:55 +0000)]
am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
6f5fac817abee63d9211e8e43646196950c43707':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:10 +0000 (23:55 +0000)]
am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
44fea60376e4e851b07eb365fd581c5b9404611f':
Fix RoundRect radius.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:06 +0000 (23:55 +0000)]
am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:02 +0000 (23:55 +0000)]
am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
34751c79d6696054b19b5fd0e2946c1dbe5bd9bd':
Better shadows.
Deepanshu Gupta [Tue, 24 Mar 2015 23:54:58 +0000 (23:54 +0000)]
am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
311a0f54ac95a1649474498748fff8327b0c917d':
Fix layoutlib tests.
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:28 +0000 (23:52 +0000)]
Merge "Update JRE for runConfigurations." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:17 +0000 (23:52 +0000)]
Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:48 +0000 (23:51 +0000)]
Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:29 +0000 (23:51 +0000)]
Merge "Use right colors for status bar and nav bar." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:10 +0000 (23:51 +0000)]
Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:50:53 +0000 (23:50 +0000)]
Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Wed, 4 Feb 2015 03:02:15 +0000 (19:02 -0800)]
Better shadows.
Better shadows for rectangles and rounded rectangles (includes circles).
The shadow painting code is mostly from CardView library, but modified
heavily since CardView needs to draw the shadow inside view bounds.
Change-Id: I88c9f19b1c16839b8d6db6df2bebff126fa5a9a3
Deepanshu Gupta [Tue, 24 Mar 2015 18:34:34 +0000 (11:34 -0700)]
Fix RoundRect radius.
Android APIs use radius for measuring the corner's curvature, but Java2D
APIs use diameter. Add the missing conversion.
Change-Id: I630fc8712e8301324c641885c0c4adf644d13b7e
Eino-Ville Talvala [Fri, 20 Feb 2015 00:28:08 +0000 (16:28 -0800)]
ImageReader: Switch to RAW16 from RAW_SENSOR
Change-Id: I6362a997b0895686f988896de0463d834354f238
Eino-Ville Talvala [Thu, 26 Feb 2015 18:57:55 +0000 (10:57 -0800)]
Add DEPTH image formats, support in ImageReader
- Add an explicit mapping between public ImageFormat/
PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
formats
Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
Yin-Chia Yeh [Thu, 12 Mar 2015 20:39:26 +0000 (13:39 -0700)]
Camera: update createStream API to add new rotation field
Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
Yin-Chia Yeh [Mon, 9 Mar 2015 23:53:14 +0000 (16:53 -0700)]
Camera: add @hide API for setting camera rotation
Only adding API header. Haven't filled in implementation.
Change-Id: I99a1c84d194dd20562845a0f566dd10ddb3041b7
Eino-Ville Talvala [Mon, 9 Feb 2015 23:56:40 +0000 (15:56 -0800)]
Camera2: Add camera pose and distortion fields
- android.lens.info.poseRotation
- android.lens.info.poseTranslation
- android.lens.info.intrinsicCalibration
- android.lens.info.radialDistortion
Change-Id: I3f8cf258b600bc58d0743e44aa6c456cd4b8a906
Eino-Ville Talvala [Thu, 5 Mar 2015 23:42:49 +0000 (15:42 -0800)]
Camera2: Wire depth formats into StreamConfigurationMap
Change-Id: I9046b60dca83d090efd9c74c98bfdfebdeae8751
Eino-Ville Talvala [Mon, 23 Feb 2015 23:20:51 +0000 (15:20 -0800)]
Camera2: Remove unused parameters in ICameraDeviceUser#createStream
- width, height, format are unused
Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b
Zhijun He [Sat, 24 Jan 2015 01:30:31 +0000 (17:30 -0800)]
camera2: update API txt for the API change
Change-Id: I4a9476849f5fde9dff669876bbdaf055bd3adc48
Zhijun He [Wed, 11 Mar 2015 18:03:54 +0000 (11:03 -0700)]
Camera2: update generated code
To solve the cherry-pick out of order issue.
Change-Id: If74a87005914dcd3fd15808482fcac4d0f70bae7
Martin Storsjo [Wed, 19 Nov 2014 09:58:03 +0000 (11:58 +0200)]
camera2: Clarify the documentation on the ImageReader usecase
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.
Change-Id: I75261baf162a58c415705db99afa474c3826f900
Yin-Chia Yeh [Fri, 30 Jan 2015 18:47:22 +0000 (10:47 -0800)]
Camera2: framework updates for HAL3.3 keys
1. Return new keys in legacy shim
2. Codegened doc update from the spec change
3. Remove DISABLED mode from available scene mode list to ensure
DISABLED is listed iff scene mode is not supported
Change-Id: If3dc74ea7e0fe6135722723f211024b604094f59
Eino-Ville Talvala [Mon, 23 Feb 2015 23:55:55 +0000 (15:55 -0800)]
Camera2: Add hidden depth stream configuration tags
Change-Id: Iec1ceb894d90210bc3ab06acc92dcbbe42b74465
Chien-Yu Chen [Wed, 11 Feb 2015 19:23:28 +0000 (11:23 -0800)]
CameraManager: implement flashlight controls
Implement the flashlight controls and callbacks and update the
torch mode states.
Bug:
2682206
Change-Id: I59025f34f9ece75dd535166a25c428b8d68c6e4b
Chien-Yu Chen [Fri, 9 Jan 2015 23:52:37 +0000 (15:52 -0800)]
CameraManager: add torch mode APIs for flashlight
Add torch mode APIs to support flashlight without opening any
camera devices.
Bug:
2682206
Change-Id: Ifb66c309f23fd7e9f124016e0d9c6b364d19acdd
Zhijun He [Mon, 12 Jan 2015 23:16:56 +0000 (15:16 -0800)]
Camera2: add lens facing EXTERNAL enum
This is for usb camera support
Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
Zhijun He [Thu, 29 Jan 2015 23:26:05 +0000 (15:26 -0800)]
Camera2: metadata spec update for reprocessing
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
Yin-Chia Yeh [Fri, 20 Feb 2015 23:52:06 +0000 (15:52 -0800)]
Camera: codegen doc update
Codegen doc update only.
Change-Id: I444d59effb957e58b14c363174693cd6c7c84ebd
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
Deepanshu Gupta [Wed, 18 Mar 2015 22:47:54 +0000 (15:47 -0700)]
Use right colors for status bar and nav bar.
Bug: http://b.android.com/81862
Change-Id: Ia10297e83e54c01a50de6cbcac2b7fef48e8d238
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