OSDN Git Service
Andreas Gampe [Tue, 17 Mar 2015 20:41:04 +0000 (20:41 +0000)]
am
0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit '
0ae488e1cb64318906397a40d8be4866e81e4860':
Frameworks/base: Use || instead of |
Andreas Gampe [Tue, 17 Mar 2015 20:40:58 +0000 (20:40 +0000)]
am
4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '
4d9076437c0270cd863493f505e734a3108e89ea':
Frameworks/base: Fix trivial equals implementation
Andreas Gampe [Tue, 17 Mar 2015 20:28:52 +0000 (20:28 +0000)]
Merge "Frameworks/base: Use || instead of |"
Andreas Gampe [Mon, 16 Mar 2015 03:32:22 +0000 (20:32 -0700)]
Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical.
Bug:
19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
Andreas Gampe [Tue, 17 Mar 2015 20:25:20 +0000 (20:25 +0000)]
Merge "Frameworks/base: Fix trivial equals implementation"
Andreas Gampe [Sun, 15 Mar 2015 22:21:25 +0000 (15:21 -0700)]
Frameworks/base: Fix trivial equals implementation
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.
Bug:
19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
Brian Carlstrom [Tue, 17 Mar 2015 19:44:55 +0000 (19:44 +0000)]
am
d8507e3a: am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
d8507e3aa4c8b05f753cd9541014c391891c1f75':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:36:19 +0000 (19:36 +0000)]
am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
83419118e3c72311ef6b900457d1b03fd5c77883':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:29:20 +0000 (19:29 +0000)]
am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Filip Gruszczynski [Tue, 17 Mar 2015 18:35:17 +0000 (18:35 +0000)]
am
86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
* commit '
86318d768a2c5043e1261e9daacf1497d1e4a732':
Option for going home when going to sleep for devices without physical button.
Filip Gruszczynski [Tue, 17 Mar 2015 18:29:29 +0000 (18:29 +0000)]
Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:52 +0000 (14:44 +0000)]
am
576801ff: am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
576801ff82a85c4de19404dfe364eef7184b84e0':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:46 +0000 (14:44 +0000)]
am
a5be9a7d: am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
a5be9a7d2d2cbcd3892fc916c9a944745024881d':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 14:36:50 +0000 (14:36 +0000)]
am
008ec61e: Merge "Change jit properties to be debug properties"
* commit '
008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3':
Change jit properties to be debug properties
Deepanshu Gupta [Tue, 17 Mar 2015 14:36:05 +0000 (14:36 +0000)]
am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:35:58 +0000 (14:35 +0000)]
am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
38467b5fbbc09ad05624454f735d27ada25565c8':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:37 +0000 (14:28 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
1f9a26af95abba385b612c734d1d5e32d9e3f363':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:33 +0000 (14:28 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:50 +0000 (14:16 +0000)]
am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:42 +0000 (14:16 +0000)]
am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 02:04:33 +0000 (02:04 +0000)]
Merge "Change jit properties to be debug properties"
Andreas Gampe [Tue, 17 Mar 2015 00:25:04 +0000 (00:25 +0000)]
am
345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '
345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
Frameworks/base: Fix a comparison
Deepanshu Gupta [Tue, 17 Mar 2015 00:21:02 +0000 (00:21 +0000)]
am
ada85905: Fix AppCompat action bar theming.
* commit '
ada8590547348b77d8cbd56abdb8fadb3e72c015':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 00:20:58 +0000 (00:20 +0000)]
am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
2e4d93245764a1c1d7515361ddbb8fc1665f814e':
Fix NoActionBar themes rendering.
Andreas Gampe [Tue, 17 Mar 2015 00:12:24 +0000 (00:12 +0000)]
Merge "Frameworks/base: Fix a comparison"
Mathieu Chartier [Mon, 16 Mar 2015 23:10:52 +0000 (16:10 -0700)]
Change jit properties to be debug properties
Bug:
19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
Andreas Gampe [Mon, 16 Mar 2015 20:49:12 +0000 (20:49 +0000)]
am
5eb42122: Merge "Frameworks/base: Force long computation"
* commit '
5eb421221bcade4f5715d42843346f7d3c733547':
Frameworks/base: Force long computation
Andreas Gampe [Mon, 16 Mar 2015 20:36:04 +0000 (20:36 +0000)]
Merge "Frameworks/base: Force long computation"
Andreas Gampe [Mon, 16 Mar 2015 19:31:17 +0000 (19:31 +0000)]
am
f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
* commit '
f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
Frameworks/base: Check before foreach in Script
Andreas Gampe [Mon, 16 Mar 2015 19:22:00 +0000 (19:22 +0000)]
am
3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit '
3d33314e03c24758e3b3bbd9e23e40199a259b80':
Frameworks/base: Use equals for Integer comparison
Andreas Gampe [Mon, 16 Mar 2015 19:17:44 +0000 (19:17 +0000)]
Merge "Frameworks/base: Check before foreach in Script"
Andreas Gampe [Mon, 16 Mar 2015 19:10:39 +0000 (19:10 +0000)]
Merge "Frameworks/base: Use equals for Integer comparison"
Deepanshu Gupta [Fri, 13 Mar 2015 18:06:47 +0000 (11:06 -0700)]
Fix AppCompat action bar theming.
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.
- Set project callback when LayoutInflater is created by
LayoutInflater.from(context).
- Remove duplication of code to get base context from context wrapper.
Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
Andreas Gampe [Mon, 16 Mar 2015 18:03:17 +0000 (18:03 +0000)]
am
6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
* commit '
6878ee57b438b063fcc09a19a04fba92e113c1d2':
Revert "Frameworks/base: Fix a constructor"
Andreas Gampe [Mon, 16 Mar 2015 17:51:14 +0000 (17:51 +0000)]
Merge "Revert "Frameworks/base: Fix a constructor""
Andreas Gampe [Mon, 16 Mar 2015 17:51:01 +0000 (17:51 +0000)]
Revert "Frameworks/base: Fix a constructor"
The constructor was public API, doh. Gotta do this differently.
This reverts commit
33c5b2a62f3e62382c41e24c6b527119978816a0.
Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
Andreas Gampe [Mon, 16 Mar 2015 17:12:57 +0000 (17:12 +0000)]
am
007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '
007e207bdeda3f0143eba8f52db3e72bf7487efb':
Frameworks/base: Fix null-pointer check
Andreas Gampe [Mon, 16 Mar 2015 17:03:02 +0000 (17:03 +0000)]
am
d61cbf9a: Merge "Frameworks/base: Fix a constructor"
* commit '
d61cbf9a08733b45a6aecafffffa60da269a3e1e':
Frameworks/base: Fix a constructor
Andreas Gampe [Mon, 16 Mar 2015 16:59:13 +0000 (16:59 +0000)]
Merge "Frameworks/base: Fix null-pointer check"
Andreas Gampe [Mon, 16 Mar 2015 16:51:00 +0000 (16:51 +0000)]
Merge "Frameworks/base: Fix a constructor"
Robert Greenwalt [Mon, 16 Mar 2015 16:29:52 +0000 (16:29 +0000)]
am
079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '
079cfa64ec827e80d3173e2043218866f1b36146':
Frameworks/base: Fix a hashCode implementation
Robert Greenwalt [Mon, 16 Mar 2015 16:17:50 +0000 (16:17 +0000)]
Merge "Frameworks/base: Fix a hashCode implementation"
Filip Gruszczynski [Sat, 14 Mar 2015 00:39:31 +0000 (17:39 -0700)]
Option for going home when going to sleep for devices without physical button.
Bug:
19623388
Change-Id: Iec16f83c64646ded12ec97d4b540510b7f9dfd47
Andreas Gampe [Mon, 16 Mar 2015 15:43:37 +0000 (15:43 +0000)]
am
5abcd06b: Merge "Frameworks/base: Fix always-false equals"
* commit '
5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
Frameworks/base: Fix always-false equals
Andreas Gampe [Mon, 16 Mar 2015 15:28:52 +0000 (15:28 +0000)]
Merge "Frameworks/base: Fix always-false equals"
John Reck [Mon, 16 Mar 2015 15:09:04 +0000 (15:09 +0000)]
am
386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '
386dcbddf5c166f98209b78389e79d49ab3a8222':
Frameworks/base: Fix missing cast
John Reck [Mon, 16 Mar 2015 14:56:51 +0000 (14:56 +0000)]
Merge "Frameworks/base: Fix missing cast"
Geoff Mendal [Mon, 16 Mar 2015 13:14:52 +0000 (13:14 +0000)]
am
0134869b: (-s ours) am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
0134869b5c81771ae3e3251fa42ac6c478e62f5a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:14:47 +0000 (13:14 +0000)]
am
3437d9e7: (-s ours) am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
3437d9e716e477d407dfc13cc797500e6421e464':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:07:29 +0000 (13:07 +0000)]
am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
74c66d10a7b2237f8aaf8c10675a10b9347860f4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:07:26 +0000 (13:07 +0000)]
am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 16 Mar 2015 12:57:17 +0000 (12:57 +0000)]
am
eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
eb1aec7fef3597fbbffe157a803e1dd54a9054b5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:57:12 +0000 (12:57 +0000)]
am
9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
9a036229277479c0bc53d850ed5c98b8b69aa080':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:52:00 +0000 (05:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I17a68a6a20954432a352e132ac02cb0c9597e1d3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:50:19 +0000 (12:50 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 16 Mar 2015 12:49:39 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 16 Mar 2015 12:49:25 +0000 (12:49 +0000)]
am
e35b3e38: (-s ours) Import translations. DO NOT MERGE
* commit '
e35b3e380f42f450ce0116b8ef83edb7d68584ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:48:31 +0000 (05:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc111cdfe84d93d8212be18ba9815a50a83f059c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:35:33 +0000 (05:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ecfa92145f12da6a6101a84c9fd10db911948a1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:35:06 +0000 (07:35 -0500)]
Import translations. DO NOT MERGE
Change-Id: I50b5dec066f0ded04d173b768fe2285f9eebf81d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:31:48 +0000 (05:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f312c6b5a86264eb96437751fefd5957383b400
Auto-generated-cl: translation import
Andreas Gampe [Mon, 16 Mar 2015 03:17:07 +0000 (20:17 -0700)]
Frameworks/base: Force long computation
Ensure that an int-based computation is carried out as long.
Change-Id: I23b10a95600674e8a5a65c0ea349afdc6aa152ae
Andreas Gampe [Mon, 16 Mar 2015 01:04:41 +0000 (18:04 -0700)]
Frameworks/base: Fix a comparison
Change-Id: I80d62869920e77110c95f20369ec2631c75f6ed4
Andreas Gampe [Sun, 15 Mar 2015 22:57:30 +0000 (15:57 -0700)]
Frameworks/base: Check before foreach in Script
According to the if below, ains == null is potentially valid. But
the foreach loop would throw a NullPointerException.
Change-Id: I4460fb1357eaa3abfe0ab9a21effb608f474ab51
Andreas Gampe [Sun, 15 Mar 2015 22:39:21 +0000 (15:39 -0700)]
Frameworks/base: Use equals for Integer comparison
Integer == is dangerous, as equal objects may not be identical
objects. In fact, MediaFormat.setInteger was creating a new object
every time.
Change MediaFormat.setInteger and setLong to use valueOf, which
may reuse returned objects.
Change-Id: Iedcc6003adbf05c0c870aa4b3ada7f181a5b870e
Andreas Gampe [Sun, 15 Mar 2015 22:07:19 +0000 (15:07 -0700)]
Frameworks/base: Fix null-pointer check
Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
Andreas Gampe [Sun, 15 Mar 2015 21:38:59 +0000 (14:38 -0700)]
Frameworks/base: Fix a hashCode implementation
Equals uses Arrays.equals. That means two responses are equal if
the content of the data arrays is equal. By convention, the hash
code of those objects should agree. In that case one cannot use
hashCode on the array (which is the identity hash code).
Change-Id: Icce8e2e71e9142421f5dac8a0ee8a211623fb704
Andreas Gampe [Sun, 15 Mar 2015 21:29:16 +0000 (14:29 -0700)]
Frameworks/base: Fix a constructor
This was meant to be a constructor, according to the comment.
Change-Id: Ief49011b392e58b37d9acb4a3f754f1828b256af
Andreas Gampe [Sun, 15 Mar 2015 21:19:43 +0000 (14:19 -0700)]
Frameworks/base: Fix always-false equals
Rect != Insets.
Change-Id: I3d4ff890608e446b51f09a1b633af742f0c069d4
Andreas Gampe [Sun, 15 Mar 2015 21:10:23 +0000 (14:10 -0700)]
Frameworks/base: Fix missing cast
Without a cast, the division is integer division.
Change-Id: I050e53778de8b1591a0be16ebbee8eed70eb1528
Dmitriy Ivanov [Fri, 13 Mar 2015 21:50:47 +0000 (21:50 +0000)]
am
9aeb080e: Merge "Switch libjnigraphics to sysv-only hash style"
* commit '
9aeb080eec2286e8604901bd2b8248be4e527107':
Switch libjnigraphics to sysv-only hash style
Dmitriy Ivanov [Fri, 13 Mar 2015 21:35:03 +0000 (21:35 +0000)]
Merge "Switch libjnigraphics to sysv-only hash style"
Deepanshu Gupta [Fri, 13 Mar 2015 01:46:36 +0000 (18:46 -0700)]
Fix NoActionBar themes rendering.
Also fix some warnings.
Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
Dmitriy Ivanov [Fri, 13 Mar 2015 19:49:47 +0000 (12:49 -0700)]
Switch libjnigraphics to sysv-only hash style
Bug:
19059885
Change-Id: I3474974983931c67dce30dfc581a8d28d8b62e6a
Luan Nguyen [Fri, 13 Mar 2015 18:50:45 +0000 (18:50 +0000)]
am
d9eb3881: am
0c89bdb7: am
0d756f7d: am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
d9eb3881f452ecb4b77062eb6505a3d7601d0a8c':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Luan Nguyen [Fri, 13 Mar 2015 18:42:03 +0000 (18:42 +0000)]
am
0c89bdb7: am
0d756f7d: am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
0c89bdb7a7eb491c503c369c0f1d9e523c8ae34a':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Jeff Tinker [Fri, 13 Mar 2015 18:35:32 +0000 (18:35 +0000)]
am
62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"
* commit '
62632e25f57989d5e5ac406e21f037a3e2f39b9c':
Handle NULL keys and NULL values in MediaDrm JNI HashMap
Luan Nguyen [Fri, 13 Mar 2015 18:28:45 +0000 (18:28 +0000)]
am
0d756f7d: am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
0d756f7d5646f84753a3db5f702f4ac79bda22bf':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Jeff Tinker [Fri, 13 Mar 2015 18:20:41 +0000 (18:20 +0000)]
Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"
Nick Kralevich [Fri, 13 Mar 2015 18:16:58 +0000 (18:16 +0000)]
am
30fcd2aa: Merge "Drop unusable SELinux APIs."
* commit '
30fcd2aa8a87ca97e1d6dbc3203c3a485a56dac9':
Drop unusable SELinux APIs.
Chad Brubaker [Fri, 13 Mar 2015 18:16:52 +0000 (18:16 +0000)]
am
f1654c60: Merge "Add initial Keymaster 1.0 tests"
* commit '
f1654c6015dbf30b7dae3575d787ca141ae84028':
Add initial Keymaster 1.0 tests
Luan Nguyen [Fri, 13 Mar 2015 18:13:39 +0000 (18:13 +0000)]
am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
217a435665880076abb71085e9d76aec4ff83b6d':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Nick Kralevich [Fri, 13 Mar 2015 18:02:46 +0000 (18:02 +0000)]
Merge "Drop unusable SELinux APIs."
Stephen Smalley [Fri, 13 Mar 2015 18:09:26 +0000 (14:09 -0400)]
Drop unusable SELinux APIs.
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.
Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Luan Nguyen [Fri, 13 Mar 2015 17:57:02 +0000 (17:57 +0000)]
am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
a8bdd2f341ded0f2096e2750d176873e3e9e89c7':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Luan Nguyen [Fri, 13 Mar 2015 17:49:46 +0000 (17:49 +0000)]
am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
42bb44dbf5bffc5d3fcf89eacfd5c561dbe8095c':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Chad Brubaker [Fri, 13 Mar 2015 17:48:06 +0000 (17:48 +0000)]
Merge "Add initial Keymaster 1.0 tests"
Luan Nguyen [Fri, 13 Mar 2015 17:42:04 +0000 (17:42 +0000)]
Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
Craig Mautner [Fri, 13 Mar 2015 00:53:51 +0000 (00:53 +0000)]
am
5be1afed: am
7151b1ef: am
98560bdf: am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
5be1afedd8f2289ba047473b242cd0535a4493fe':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:46:51 +0000 (00:46 +0000)]
am
7151b1ef: am
98560bdf: am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
7151b1ef4213207103a669602d6bb9502bc22a13':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:37:32 +0000 (00:37 +0000)]
am
98560bdf: am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
98560bdf87ad5f97054b13d3c92954132584c7f7':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:29:21 +0000 (00:29 +0000)]
am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
bfcc60a3f03ff25dccb5277626da213b1e254ccd':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:22:33 +0000 (00:22 +0000)]
am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
2825a9c618840c1cf3d59806a794674f12a7c7c6':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:17:36 +0000 (00:17 +0000)]
am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:09:30 +0000 (00:09 +0000)]
Merge "Correct docs to specify leading slash in paths." into lmp-docs
Olawale Ogunwale [Thu, 12 Mar 2015 21:38:41 +0000 (21:38 +0000)]
am
53729e29: Merge "Wait for opening apps ready before stopping freezing display"
* commit '
53729e2933540307b090e64ee89cbae26c67de8f':
Wait for opening apps ready before stopping freezing display
Olawale Ogunwale [Thu, 12 Mar 2015 21:38:30 +0000 (21:38 +0000)]
am
1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions"
* commit '
1b4933d10eea59b091f263ebb3723f4d59a85d2b':
Wait for visible wallpaper drawn before starting app transitions
Roozbeh Pournader [Thu, 12 Mar 2015 21:33:35 +0000 (21:33 +0000)]
am
07e01e07: am
11b6e235: am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
* commit '
07e01e07bbfffa9e247a54dd96b3013de46d59e7':
Move Noto Sans Tai Le to the end of the font fallback list.