OSDN Git Service
Tenghui Zhu [Sun, 29 Mar 2015 00:01:25 +0000 (00:01 +0000)]
Merge "Revert "Use AVD for checkbox animation.""
Tenghui Zhu [Sat, 28 Mar 2015 23:27:12 +0000 (23:27 +0000)]
Revert "Use AVD for checkbox animation."
This reverts commit
9734bdc97ee3049cdadfb04fce1fd76626934519.
Change-Id: I2736560a7712418b7b69507a82619b9ca8552014
Svet Ganov [Sat, 28 Mar 2015 20:23:10 +0000 (20:23 +0000)]
Merge "Fix a regression in settings parsing"
Svet Ganov [Sat, 28 Mar 2015 20:21:22 +0000 (13:21 -0700)]
Fix a regression in settings parsing
Change-Id: I222bac482a843112ae031b00c83e3765ea6b456c
Mike Lockwood [Sat, 28 Mar 2015 16:00:19 +0000 (16:00 +0000)]
Merge "Make the MIDI Manager optional, enabled by "android.software.midi" feature"
Andreas Gampe [Sat, 28 Mar 2015 05:18:14 +0000 (05:18 +0000)]
am
3fa46a0f: am
d7fb6d26: am
a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '
3fa46a0f79f35ca32ce102d4bbb1138c517ee754':
Frameworks/base: Change String == to equals in Preference
Andreas Gampe [Sat, 28 Mar 2015 05:18:03 +0000 (05:18 +0000)]
am
1bca3532: am
0e6b4da5: am
5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '
1bca3532687675d81dea805b12577a6c3a00b4c3':
Frameworks/base: Fix request removal in VoiceInteractionSession
Andreas Gampe [Sat, 28 Mar 2015 05:11:07 +0000 (05:11 +0000)]
am
d7fb6d26: am
a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '
d7fb6d26d809775996f70e23213392a3dcf10c8f':
Frameworks/base: Change String == to equals in Preference
Andreas Gampe [Sat, 28 Mar 2015 05:11:02 +0000 (05:11 +0000)]
am
0e6b4da5: am
5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '
0e6b4da5ca53d338f351827f7a351edcd6281aaa':
Frameworks/base: Fix request removal in VoiceInteractionSession
Andreas Gampe [Sat, 28 Mar 2015 05:03:25 +0000 (05:03 +0000)]
am
a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '
a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
Frameworks/base: Change String == to equals in Preference
Andreas Gampe [Sat, 28 Mar 2015 05:03:18 +0000 (05:03 +0000)]
am
5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '
5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
Frameworks/base: Fix request removal in VoiceInteractionSession
Andreas Gampe [Sat, 28 Mar 2015 04:50:42 +0000 (04:50 +0000)]
Merge "Frameworks/base: Change String == to equals in Preference"
Andreas Gampe [Sat, 28 Mar 2015 04:50:07 +0000 (04:50 +0000)]
Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
Christopher Tate [Sat, 28 Mar 2015 01:47:53 +0000 (01:47 +0000)]
Merge "Respect the transport's requestFullBackupTime() backoff"
Svet Ganov [Sat, 28 Mar 2015 00:59:35 +0000 (00:59 +0000)]
Merge "Relax the parsing code in settings provider."
Svet Ganov [Sat, 28 Mar 2015 00:55:08 +0000 (17:55 -0700)]
Relax the parsing code in settings provider.
The practice in the system server is to have lenient parsing code
to avoid the whole system being unusable due to a single XML error.
Change-Id: Idf44031edf5221966f3352ca2f83e284973ab95f
Christopher Tate [Sat, 28 Mar 2015 00:58:18 +0000 (17:58 -0700)]
Respect the transport's requestFullBackupTime() backoff
We now make sure to pause by at least requestFullBackupTime() between full-data
backup operations, to give the transport the ability to apply traffic control
while we're running the queue of eligible packages.
Also, we now reset a package's queue position whenever a full-data backup for
that package is run explicitly via adb.
Bug
19732890
Change-Id: I6cf24495ad18eebd55557f229d11c703e5b7f529
Geoff Mendal [Sat, 28 Mar 2015 00:12:54 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 28 Mar 2015 00:12:34 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 28 Mar 2015 00:12:13 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Christopher Tate [Fri, 27 Mar 2015 23:50:57 +0000 (23:50 +0000)]
Merge "Add payload-size preflight stage to full transport backup"
Alex Klyubin [Fri, 27 Mar 2015 23:49:25 +0000 (23:49 +0000)]
am
23c2b8e8: am
d7e06104: am
36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '
23c2b8e81ec5a6e0c344f09e728d87300ac29bc2':
Symmetric key generation for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 23:49:17 +0000 (23:49 +0000)]
am
db22c659: am
3e89fac5: am
dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '
db22c6595c1b1949ff5473517609a7315b8e130f':
Allow entropy to be provided to some operations
Bart Sears [Fri, 27 Mar 2015 23:43:31 +0000 (23:43 +0000)]
am
8045a23a: am
c27d3c2b: am
c03cfc9d: am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
8045a23a08898abadcd3e3d355d65d757480e1e6':
CEC: Explicitly turn on screen for remote control passthrough
Geoff Mendal [Fri, 27 Mar 2015 23:40:35 +0000 (16:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae448041b1480ae3582be4c0b07dc4e4b1688e25
Auto-generated-cl: translation import
Alex Klyubin [Fri, 27 Mar 2015 23:37:49 +0000 (23:37 +0000)]
am
d7e06104: am
36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '
d7e0610477b1a97ce6b566a19e1fe9246bc30f52':
Symmetric key generation for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 23:37:44 +0000 (23:37 +0000)]
am
3e89fac5: am
dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '
3e89fac56966fc30790430f128887a987fea63d8':
Allow entropy to be provided to some operations
Geoff Mendal [Fri, 27 Mar 2015 23:37:11 +0000 (16:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iedf7a61cde1c2eed81a716c76afeaaf1388794e2
Auto-generated-cl: translation import
Alex Klyubin [Fri, 27 Mar 2015 23:31:38 +0000 (23:31 +0000)]
am
8e7df37c: am
d880dc2f: am
274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '
8e7df37c9af178cd443c487f258773c0017501aa':
Symmetric key import for AndroidKeyStore.
Adam Metcalf [Fri, 27 Mar 2015 23:26:30 +0000 (23:26 +0000)]
Merge "Add support for GmsCore to apilint.py"
Alex Klyubin [Fri, 27 Mar 2015 23:26:08 +0000 (23:26 +0000)]
am
36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '
36ee836d2f6e6df59d6a20a69421639bacf25559':
Symmetric key generation for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 23:25:59 +0000 (23:25 +0000)]
am
dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '
dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
Allow entropy to be provided to some operations
Bart Sears [Fri, 27 Mar 2015 23:24:11 +0000 (23:24 +0000)]
am
c27d3c2b: am
c03cfc9d: am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
c27d3c2bd440a69d22bec8dd2c7bfe511fa53eba':
CEC: Explicitly turn on screen for remote control passthrough
Geoff Mendal [Fri, 27 Mar 2015 23:23:30 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie3cde38ec6847cf49d6ce2ed9b21b23f27ef5d63
Auto-generated-cl: translation import
Adam Metcalf [Fri, 27 Mar 2015 23:11:23 +0000 (16:11 -0700)]
Add support for GmsCore to apilint.py
Add flag to allow references to google.
Refactor argument parsing to use argparse.
Change-Id: I5fd3b6628a00113b9644dcae2919632db056909d
Alex Klyubin [Fri, 27 Mar 2015 23:13:24 +0000 (23:13 +0000)]
am
d880dc2f: am
274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '
d880dc2fb23aa3564c46169f7b0651bd2ca2c2de':
Symmetric key import for AndroidKeyStore.
Bart Sears [Fri, 27 Mar 2015 23:08:46 +0000 (23:08 +0000)]
am
c03cfc9d: am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
c03cfc9d86c4324464ae44b49c7ac31c9a4bba50':
CEC: Explicitly turn on screen for remote control passthrough
Alex Klyubin [Fri, 27 Mar 2015 22:59:18 +0000 (22:59 +0000)]
Merge "Symmetric key generation for AndroidKeyStore."
Alex Klyubin [Fri, 27 Mar 2015 21:39:28 +0000 (14:39 -0700)]
Symmetric key generation for AndroidKeyStore.
This currently supports AES and HMAC with SHA-256.
Bug:
18088752
Change-Id: Ife55438cf4129b895295681bb35091cd37eb73fb
Elliott Hughes [Fri, 27 Mar 2015 22:45:07 +0000 (22:45 +0000)]
Merge "Document that Time doesn't support pseudo-zones."
Adrian Roos [Fri, 27 Mar 2015 22:18:38 +0000 (22:18 +0000)]
Merge "Add emergency assistance API and setting"
Elliott Hughes [Fri, 27 Mar 2015 22:18:12 +0000 (15:18 -0700)]
Document that Time doesn't support pseudo-zones.
Bug:
19110194
Change-Id: I653b7dc46d5f15da70435f6bddd49042f4d03b54
Yin-Chia Yeh [Fri, 27 Mar 2015 21:50:41 +0000 (21:50 +0000)]
Merge "Camera: codegen doc update"
Yin-Chia Yeh [Fri, 27 Mar 2015 20:54:04 +0000 (13:54 -0700)]
Camera: codegen doc update
Bug:
19966527
Change-Id: I47c450d5661374c0a51d02bb79fccff1d26338f7
Alex Klyubin [Fri, 27 Mar 2015 21:42:08 +0000 (21:42 +0000)]
am
274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '
274a4ee3446e76a34a9cfe987e98f7bf4e53f78d':
Symmetric key import for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 21:38:43 +0000 (21:38 +0000)]
Merge "Allow entropy to be provided to some operations"
Chad Brubaker [Fri, 27 Mar 2015 21:28:35 +0000 (14:28 -0700)]
Allow entropy to be provided to some operations
generateKey and begin can now optionally take an array of bytes to add
to the rng entropy of the device before the operation. If entropy is
specified and the device does not support add_rng_entropy or the call
fails then that device will not be used, leading to fallback or error
depending on the situation.
Change-Id: Id7d33e3cc959594dfa5483d002993ba35c1fb134
Adrian Roos [Thu, 26 Mar 2015 19:31:16 +0000 (12:31 -0700)]
Add emergency assistance API and setting
Bug:
19841649
Change-Id: I5bc99df6d85eb84b253456e32ce52afd7592a95e
Bart Sears [Fri, 27 Mar 2015 21:23:01 +0000 (21:23 +0000)]
am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
d4c3ef87f8aaef9eb5ec66856dffc9eca5537573':
CEC: Explicitly turn on screen for remote control passthrough
Bart Sears [Fri, 27 Mar 2015 21:14:37 +0000 (21:14 +0000)]
am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
4a26c391d08dfa6a3c189293f0fc163b817b1b49':
CEC: Explicitly turn on screen for remote control passthrough
John Spurlock [Fri, 27 Mar 2015 21:13:39 +0000 (21:13 +0000)]
Merge "AudioService: Observe changes to output devices per-stream."
John Spurlock [Fri, 27 Mar 2015 21:13:21 +0000 (21:13 +0000)]
Merge "Fix a few found doc problems."
Wenchao Tong [Tue, 17 Mar 2015 23:14:23 +0000 (16:14 -0700)]
Keep debug information in NetworkStats files
Create two special SETs.
SET_DBG_VPN_IN is used by individual applications to know
how much traffic of the NetworkIdentity was actually moved
from a VPN app.
SET_DBG_VPN_OUT is used by the VPN app to know how much
traffic of the NetworkIdentity was deducted.
A debug application can restore the raw stats by these
entries.
raw_traffic = recorded_entry (TAG_NONE, SET_ALL)
+ recorded_entry (TAG_NONE, SET_DBF_VPN_OUT)
- recorded_entry (TAG_NONE, SET_DBF_VPN_IN)
The two debug SETs are not returned by
NetworkStatsService.openSession(). These debug entries are
retrieved by NetworkStatsCollection.dump().
Bug:
19536273
Change-Id: I03ef9f7667f5f2f48cbe3f6b11447fe7ead8ad3b
Bart Sears [Fri, 27 Mar 2015 20:48:37 +0000 (20:48 +0000)]
Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
Wenchao Tong [Fri, 27 Mar 2015 20:43:33 +0000 (20:43 +0000)]
Merge "Create a Benchmark test for NetworkStats."
Mike Lockwood [Fri, 27 Mar 2015 20:23:41 +0000 (13:23 -0700)]
Make the MIDI Manager optional, enabled by "android.software.midi" feature
Change-Id: I76d442ea28beea4b9e2876bfef501d8f61403702
Alex Klyubin [Fri, 27 Mar 2015 19:21:12 +0000 (19:21 +0000)]
Merge "Symmetric key import for AndroidKeyStore."
Chris Wren [Fri, 27 Mar 2015 18:36:32 +0000 (18:36 +0000)]
Merge "add a metrics logger"
Andres Morales [Fri, 27 Mar 2015 18:18:28 +0000 (18:18 +0000)]
Merge "Add system prop to track if oem unlock is allowed"
Alan Viverette [Fri, 27 Mar 2015 18:03:06 +0000 (18:03 +0000)]
Merge "Only verify resolved theme attributes"
Adrian Roos [Fri, 27 Mar 2015 18:00:06 +0000 (18:00 +0000)]
Merge "Properly unregister TrustAgentWrapper's broadcast receiver"
Alan Viverette [Fri, 27 Mar 2015 17:57:34 +0000 (10:57 -0700)]
Only verify resolved theme attributes
Bug:
19962473
Change-Id: I62eb2faea7b09fd483194b41e815179cb2141fcb
Alan Viverette [Fri, 27 Mar 2015 17:46:49 +0000 (17:46 +0000)]
Merge "Clean up lint warnings in Resources"
Alan Viverette [Fri, 27 Mar 2015 17:44:39 +0000 (10:44 -0700)]
Clean up lint warnings in Resources
Change-Id: I28dff6f293c5b6c24fc451f282d11d648042d5dd
Chris Wren [Fri, 20 Mar 2015 14:34:20 +0000 (10:34 -0400)]
add a metrics logger
Change-Id: I5b1dccb5d103ece3112acf38889bae16273b092f
ztenghui [Fri, 27 Mar 2015 17:28:10 +0000 (17:28 +0000)]
Merge "Use AVD for checkbox animation."
Kris Giesing [Fri, 27 Mar 2015 17:20:31 +0000 (17:20 +0000)]
Merge "Allow override of Motoya with full NotoSans"
Abodunrinwa Toki [Fri, 27 Mar 2015 17:16:57 +0000 (17:16 +0000)]
Merge "New floating toolbar implementation for secondary action mode views."
Skuhne [Fri, 27 Mar 2015 17:08:26 +0000 (17:08 +0000)]
Merge "Unopened tasks should show the fullscreen item in recents"
Tim Volodine [Fri, 27 Mar 2015 16:45:24 +0000 (16:45 +0000)]
Merge "Invoke geolocation permissions callback with denied state by default."
Abodunrinwa Toki [Fri, 27 Mar 2015 15:02:03 +0000 (15:02 +0000)]
New floating toolbar implementation for secondary action mode views.
Change-Id: I04d179576290f1b107b3777287d81f149e16e658
Alex Klyubin [Fri, 27 Mar 2015 15:23:03 +0000 (15:23 +0000)]
Merge "Unhide public API about cleartext traffic policy."
Skuhne [Thu, 26 Mar 2015 23:57:12 +0000 (16:57 -0700)]
Unopened tasks should show the fullscreen item in recents
BUG:
19947524
Change-Id: I83d2143f312ed016264c8bc54fda31720100ff1f
Flavio Lerda [Fri, 27 Mar 2015 13:00:44 +0000 (13:00 +0000)]
Merge "Dump sharedLibraryFiles in a readable way."
Raph Levien [Fri, 27 Mar 2015 05:59:14 +0000 (05:59 +0000)]
Merge "Calculate line breaks using Minikin"
Raph Levien [Sat, 7 Mar 2015 03:19:48 +0000 (19:19 -0800)]
Calculate line breaks using Minikin
This patch moves the calculation of line breaks for StaticLayout into
the new LineBreaker class provided by Minikin. This specific patch
should preserve existing functionality, but perhaps performance is
better, and the movement opens the door to much more sophisticated
line-breaking.
Change-Id: Iafccb9da4e3559bbeaeb2c7c85f86ddfd8ae2fa1
Svetoslav [Fri, 27 Mar 2015 04:06:06 +0000 (04:06 +0000)]
Merge "Handle dynamic enable/disable of runtime permissions support."
Svetoslav [Fri, 27 Mar 2015 03:53:34 +0000 (20:53 -0700)]
Handle dynamic enable/disable of runtime permissions support.
This change adds support for the case where we change the state
of runtime permissions support via the system property. This
was not working properly before because we did not handle system
app permissions properly.:
Change-Id: I66c5e6c823b8521999972b0432b1daaba38c9709
Deepanshu Gupta [Fri, 27 Mar 2015 03:29:15 +0000 (03:29 +0000)]
Christopher Tate [Fri, 27 Mar 2015 03:29:02 +0000 (03:29 +0000)]
am
9c36cf41: am
9837c51a: am
63862a20: am
7b73a788: am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
9c36cf4195158b94600a5e1125835627629087e8':
When scanning unbundled apps, only install the expected APK tree
Deepanshu Gupta [Fri, 27 Mar 2015 03:15:31 +0000 (03:15 +0000)]
Christopher Tate [Fri, 27 Mar 2015 03:15:27 +0000 (03:15 +0000)]
am
9837c51a: am
63862a20: am
7b73a788: am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
9837c51acc274531a4109b9973a7d7927787da6c':
When scanning unbundled apps, only install the expected APK tree
Deepanshu Gupta [Fri, 27 Mar 2015 03:05:16 +0000 (03:05 +0000)]
am
fb37c97c: am
61bb0b4f: am
4e6ae02a: am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
fb37c97c251cc9bef81dbf5b9acc58328656a980':
Fix tests for Java 6.
Christopher Tate [Fri, 27 Mar 2015 03:05:09 +0000 (03:05 +0000)]
am
63862a20: am
7b73a788: am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
63862a2052d41db4543a6a15713f5146b76d65cc':
When scanning unbundled apps, only install the expected APK tree
Deepanshu Gupta [Fri, 27 Mar 2015 02:58:47 +0000 (02:58 +0000)]
am
61bb0b4f: am
4e6ae02a: am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
61bb0b4f58f794ff468f2cfaf958cb5cc0b09026':
Fix tests for Java 6.
Christopher Tate [Fri, 27 Mar 2015 02:58:40 +0000 (02:58 +0000)]
am
7b73a788: am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
7b73a788f0c18a31de729daa51e7e06286cf7609':
When scanning unbundled apps, only install the expected APK tree
Deepanshu Gupta [Fri, 27 Mar 2015 02:49:27 +0000 (02:49 +0000)]
am
4e6ae02a: am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
4e6ae02a29dd432648a81f3803f3ccf712621d43':
Fix tests for Java 6.
Christopher Tate [Fri, 27 Mar 2015 02:49:23 +0000 (02:49 +0000)]
am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
dbe0dd160e93feef1335830a36e86ae83b19b793':
When scanning unbundled apps, only install the expected APK tree
John Spurlock [Fri, 27 Mar 2015 02:33:31 +0000 (02:33 +0000)]
Merge "AudioService: Resolve stream before sending to volume UI."
Christopher Tate [Wed, 25 Mar 2015 01:48:10 +0000 (18:48 -0700)]
Add payload-size preflight stage to full transport backup
We now peform a total-size preflight pass before committing data to the
wire. This is to eliminate the large superfluous network traffic that
would otherwise happen if the transport enforces internal quotas: we
now instead ask the transport up front whether it's prepared to accept
a given payload size for the package.
From the app's perspective this preflight operation is indistinguishable
from a full-data backup pass. If the app has provided its own full-data
handling in a subclassed backup agent, their usual file-providing code
path will be executed. However, the files named for backup during this
pass are not opened and read; just measured for their total size. As
far as component lifecycles, this measurement pass is simply another
call to the agent, immediately after it is bound, with identical
timeout semantics to the existing full-data backup invocation.
Once the app's file set has been measured the preflight operation
invokes a new method on BackupTransport, called checkFullBackupSize().
This method is called after performFullBackup() (which applies any
overall whitelist/blacklist policy) but before any data is delivered
to the transport via sendBackupData(). The return code from
checkFullBackupSize() is similar to the other transport methods:
TRANSPORT_OK to permit the full backup to proceed; or
TRANSPORT_REJECT_PACKAGE to indicate that the requested payload is
unacceptable; or TRANSPORT_ERROR to report a more serious overall
transport-level problem that prevents a full-data backup operation
from occurring right now.
The estimated payload currently does not include the size of the
source-package metadata (technically, the manifest entry in its
archive payload) or the size of any widget metadata associated with
the package's install. In practice this means the preflighted size
underestimates by 3 to 5 KB. In addition, the preflight API currently
cannot distinguish between payload sizes larger than 2 gigabytes;
any payload estimate larger than that is passed as Integer.MAX_VALUE
to the checkFullBackupSize() query.
Bug
19846750
Change-Id: I44498201e2d4b07482dcb3ca8fa6935dddc467ca
Jason Sams [Fri, 27 Mar 2015 01:50:56 +0000 (01:50 +0000)]
am
5f786f0d: am
226fc774: am
ee80414d: Merge "Fix doc bug for object size."
* commit '
5f786f0dabe93eb1bf391ffc3f57f03b9b9ce575':
Fix doc bug for object size.
Michael Runge [Fri, 27 Mar 2015 01:50:49 +0000 (01:50 +0000)]
am
34ec4cc7: am
7b1237e5: am
0f9b7015: am
9e3976b6: am
9a91bf1d: am
96f47f5b: am
b0197033: Increase timeout when uncrypting OTA
* commit '
34ec4cc7b31b28da896258cdeb7135ecaa876ec5':
Increase timeout when uncrypting OTA
Amith Yamasani [Fri, 27 Mar 2015 01:50:43 +0000 (01:50 +0000)]
am
bf67d25b: am
cffe727e: am
a5c20b98: am
c704bc64: am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
bf67d25be9fe400ad5099df6d100f9817d2c380f':
Deepanshu Gupta [Fri, 27 Mar 2015 01:50:36 +0000 (01:50 +0000)]
am
ec2a4096: am
c55858ff: am
fc18e950: am
cfdd1e18: am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
ec2a40969ca4900f2646a68c9c0467ae2a9775ca':
Deepanshu Gupta [Fri, 27 Mar 2015 01:50:29 +0000 (01:50 +0000)]
am
1bf6d543: (-s ours) am
5935ee2f: am
836f5d98: am
85afc992: am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
1bf6d5432f90d210e8cd01a820e83950b5de076e':
Deepanshu Gupta [Fri, 27 Mar 2015 01:50:23 +0000 (01:50 +0000)]
Deepanshu Gupta [Fri, 27 Mar 2015 01:50:15 +0000 (01:50 +0000)]
am
1a3b4701: am
1a715a54: am
7a5a976c: am
c07448d2: am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
1a3b4701f7cfbab8e28e9d4de3daa07dc2b5aa82':
Deepanshu Gupta [Fri, 27 Mar 2015 01:50:09 +0000 (01:50 +0000)]
Deepanshu Gupta [Fri, 27 Mar 2015 01:50:03 +0000 (01:50 +0000)]
Jeff Brown [Fri, 27 Mar 2015 01:49:56 +0000 (01:49 +0000)]
am
833ed282: am
16869c8e: am
a15ce03e: am
64646def: am
d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '
833ed282e17ad20ff79ef6391c43c8b6b2af61ea':