OSDN Git Service
Eric Laurent [Wed, 27 Aug 2014 22:13:46 +0000 (22:13 +0000)]
am
02d9054a: am
db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev
* commit '
02d9054a9a9440b0f12780221cc385fe6334f556':
fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
Eric Laurent [Wed, 27 Aug 2014 21:59:21 +0000 (21:59 +0000)]
am
db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev
* commit '
db1c0e1964f514ccaab1cc1b6325f5db0fe11fd0':
fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
Jim Miller [Wed, 27 Aug 2014 21:52:59 +0000 (21:52 +0000)]
am
694a6bbc: am
c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev
* commit '
694a6bbcc6c49a76fae440fdadab16879556c7bf':
Hide trust agent whitelisting until new API is ready.
Eric Laurent [Wed, 27 Aug 2014 21:47:09 +0000 (21:47 +0000)]
Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev
Jim Miller [Wed, 27 Aug 2014 21:44:15 +0000 (21:44 +0000)]
am
c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev
* commit '
c5cabe2d00450cb18f856618260e0fa7d780452b':
Hide trust agent whitelisting until new API is ready.
Sascha Prueter [Wed, 27 Aug 2014 21:43:47 +0000 (21:43 +0000)]
am
a64ecf44: am
10651214: Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev
* commit '
a64ecf44914f8654cf983cde4298df283ccf8f15':
Add null check to cleanupRecentTasksLocked.
Michael Wright [Wed, 27 Aug 2014 21:43:42 +0000 (21:43 +0000)]
am
29969105: am
ca95dc97: Merge "Allow voice assist to function in a non-interactive state" into lmp-dev
* commit '
2996910596cd6d71637f8c38f57a6ced0cc77963':
Allow voice assist to function in a non-interactive state
Jim Miller [Wed, 27 Aug 2014 21:36:53 +0000 (21:36 +0000)]
am
56c0e1db: am
61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev
* commit '
56c0e1db523779ee7856ac196b7370b7433142b3':
Change name of confirm credentials method after API review
Winson Chung [Wed, 27 Aug 2014 21:36:24 +0000 (21:36 +0000)]
am
1e1c328f: am
4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug
16987565)" into lmp-dev
* commit '
1e1c328f9e9605e8eed1e9729067dfd702fb4f81':
Additional changes to improve performance when loading Recents. (Bug
16987565)
Alan Viverette [Wed, 27 Aug 2014 21:36:18 +0000 (21:36 +0000)]
am
f467b7c0: am
738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev
* commit '
f467b7c0e434902a48d9c459c4d4de0279e8f160':
Fix NPE in RippleDrawable
Alan Viverette [Wed, 27 Aug 2014 21:36:12 +0000 (21:36 +0000)]
am
7d5bbea6: am
11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev
* commit '
7d5bbea6bf76a705cd9d6d3d0cdfad18169440bf':
Rename Spinner.Form to Spinner.Underlined, make Alert theme public
John Spurlock [Wed, 27 Aug 2014 21:35:55 +0000 (21:35 +0000)]
am
8354e284: am
98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev
* commit '
8354e2846d962b054c85832b62b621bd8ae1ff48':
Doze: Null check in NotificationContentView.mContractedChild.
Eino-Ville Talvala [Wed, 27 Aug 2014 21:35:42 +0000 (21:35 +0000)]
am
4046697e: am
579442e8: Merge "Camera2: Correct error handling" into lmp-dev
* commit '
4046697e3a6b409e8bcd76a06b3d457814c8f444':
Camera2: Correct error handling
Jim Miller [Wed, 27 Aug 2014 21:29:11 +0000 (21:29 +0000)]
Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev
Jim Miller [Wed, 27 Aug 2014 01:42:58 +0000 (18:42 -0700)]
Hide trust agent whitelisting until new API is ready.
Fixes bug
17008504
Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
Sascha Prueter [Wed, 27 Aug 2014 21:26:55 +0000 (21:26 +0000)]
am
10651214: Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev
* commit '
10651214051b921da4c0b01d1825c84906cd8c53':
Add null check to cleanupRecentTasksLocked.
Michael Wright [Wed, 27 Aug 2014 21:26:50 +0000 (21:26 +0000)]
am
ca95dc97: Merge "Allow voice assist to function in a non-interactive state" into lmp-dev
* commit '
ca95dc97a64a5b69c5bb4cce62590c335dfe5d71':
Allow voice assist to function in a non-interactive state
Sascha Prueter [Wed, 27 Aug 2014 21:18:33 +0000 (21:18 +0000)]
Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev
Michael Wright [Wed, 27 Aug 2014 21:16:32 +0000 (21:16 +0000)]
Merge "Allow voice assist to function in a non-interactive state" into lmp-dev
Craig Mautner [Wed, 27 Aug 2014 21:01:25 +0000 (14:01 -0700)]
Add null check to cleanupRecentTasksLocked.
If during boot, the package manager broadcast occurs before
TaskPersister has restored the recents list then mRecentTasks will be
null and an NPE will occur. This checks for null mRecentsTasks and
returns before the NPE happens.
Fixes bug
17300409.
Change-Id: I1588ad3a3c0d04bc6f273630ef5dadf6821e5710
Jim Miller [Wed, 27 Aug 2014 20:57:32 +0000 (20:57 +0000)]
am
61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev
* commit '
6104323343861e1d1edc586e19f2fdece3025065':
Change name of confirm credentials method after API review
Jim Miller [Wed, 27 Aug 2014 20:42:18 +0000 (20:42 +0000)]
Merge "Change name of confirm credentials method after API review" into lmp-dev
Winson Chung [Wed, 27 Aug 2014 20:17:22 +0000 (20:17 +0000)]
am
4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug
16987565)" into lmp-dev
* commit '
4de668bcb1a03e505e585d43b080029aa2780e5d':
Additional changes to improve performance when loading Recents. (Bug
16987565)
Alan Viverette [Wed, 27 Aug 2014 20:11:46 +0000 (20:11 +0000)]
am
738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev
* commit '
738aeaf442e0d7928dc795b726a5fac034471d94':
Fix NPE in RippleDrawable
Winson Chung [Wed, 27 Aug 2014 20:09:55 +0000 (20:09 +0000)]
Merge "Additional changes to improve performance when loading Recents. (Bug
16987565)" into lmp-dev
Alan Viverette [Wed, 27 Aug 2014 20:04:27 +0000 (20:04 +0000)]
Merge "Fix NPE in RippleDrawable" into lmp-dev
Alan Viverette [Wed, 27 Aug 2014 19:57:54 +0000 (19:57 +0000)]
am
11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev
* commit '
11e73661d71e8616b502f800eca9a7985115e898':
Rename Spinner.Form to Spinner.Underlined, make Alert theme public
Alan Viverette [Wed, 27 Aug 2014 19:44:36 +0000 (19:44 +0000)]
Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev
Eric Laurent [Wed, 27 Aug 2014 19:36:33 +0000 (12:36 -0700)]
fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
In checkSendBecomingNoisyIntent(), only output devices
must be taken into account when checking if the device
type is in mBecomingNoisyIntentDevices
Bug:
17298383.
Bug:
16403219.
Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8
Alan Viverette [Wed, 27 Aug 2014 19:28:18 +0000 (12:28 -0700)]
Rename Spinner.Form to Spinner.Underlined, make Alert theme public
BUG:
17286794
BUG:
17295515
Change-Id: I010bb1591f7690dbc40020d3fdd413f8e1bd8547
John Spurlock [Wed, 27 Aug 2014 19:25:30 +0000 (19:25 +0000)]
am
98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev
* commit '
98a354d4619cc90bd0ef3417fbe2bc9165d4496d':
Doze: Null check in NotificationContentView.mContractedChild.
John Spurlock [Wed, 27 Aug 2014 19:15:02 +0000 (19:15 +0000)]
Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev
Winson Chung [Tue, 26 Aug 2014 19:25:34 +0000 (12:25 -0700)]
Additional changes to improve performance when loading Recents. (Bug
16987565)
- Ensuring that we consistently load activity icon, title and color for both full and shallow stacks
- Adding activity info caches when loading the stacks
- Should not be scaling pin icon when launching from pin
- Tweaking snap-back, over scroll, and shadows
Change-Id: I556b93562bb2c69e4c25ce787a7a34532ab706ca
Eino-Ville Talvala [Wed, 27 Aug 2014 18:58:42 +0000 (18:58 +0000)]
am
579442e8: Merge "Camera2: Correct error handling" into lmp-dev
* commit '
579442e87e9737f424663d01e163cbc23b1346d1':
Camera2: Correct error handling
John Spurlock [Wed, 27 Aug 2014 18:55:54 +0000 (14:55 -0400)]
Doze: Null check in NotificationContentView.mContractedChild.
Bug:
17247547
Change-Id: Iede5d0cd88db4e293e583f3a3c324354eb6d594e
Eino-Ville Talvala [Wed, 27 Aug 2014 18:47:30 +0000 (18:47 +0000)]
Merge "Camera2: Correct error handling" into lmp-dev
Jean-Michel Trivi [Wed, 27 Aug 2014 18:41:36 +0000 (18:41 +0000)]
am
c313bbcb: am
24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev
* commit '
c313bbcbd313d682a23ea0cce99be3d1b3da6624':
SoundPool.Builder: document default values
Jean-Michel Trivi [Wed, 27 Aug 2014 18:29:36 +0000 (18:29 +0000)]
am
24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev
* commit '
24562d7e5c73c6be3225eff1f53ca4ffa94f09e0':
SoundPool.Builder: document default values
Jean-Michel Trivi [Wed, 27 Aug 2014 18:23:00 +0000 (18:23 +0000)]
Merge "SoundPool.Builder: document default values" into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 18:21:48 +0000 (18:21 +0000)]
am
542a7796: am
37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev
* commit '
542a77966963147f7b8d4705275628737fa176a0':
Recreate lib symlink after deleting app data.
Jeff Sharkey [Wed, 27 Aug 2014 18:21:43 +0000 (18:21 +0000)]
am
bfe28603: am
31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev
* commit '
bfe28603b7ac6a5faf071fe30bbd1c9272fc69e3':
Clear pending operation flag when move failed.
Eino-Ville Talvala [Wed, 6 Aug 2014 21:31:08 +0000 (14:31 -0700)]
Camera2: Correct error handling
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason
Bug:
17160301
Bug:
15524101
Bug:
14448494
Bug:
11272459
Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
Amith Yamasani [Wed, 27 Aug 2014 18:07:42 +0000 (18:07 +0000)]
am
8f3e59d6: am
e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev
* commit '
8f3e59d674c1766e1566f7b28ebbe175aacdc19e':
Fix incorrect reading of multichoice app restrictions
Jeff Sharkey [Wed, 27 Aug 2014 18:05:33 +0000 (18:05 +0000)]
am
37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev
* commit '
37589a33e8abb534b931b0246143c85f5b4fbb75':
Recreate lib symlink after deleting app data.
Jeff Sharkey [Wed, 27 Aug 2014 18:05:28 +0000 (18:05 +0000)]
am
31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev
* commit '
31d0207abfbfe15a63028010e0d5230268b94a52':
Clear pending operation flag when move failed.
Jeff Sharkey [Wed, 27 Aug 2014 17:58:37 +0000 (17:58 +0000)]
Merge "Recreate lib symlink after deleting app data." into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 17:58:16 +0000 (17:58 +0000)]
Merge "Clear pending operation flag when move failed." into lmp-dev
Craig Mautner [Wed, 27 Aug 2014 17:55:35 +0000 (17:55 +0000)]
am
ece9e05d: am
b46e78f9: Merge "Revert "Debug for
13924095."" into lmp-dev
* commit '
ece9e05dd4b36ca8eafbbea4c875de84c5c79695':
Revert "Debug for
13924095."
Amith Yamasani [Wed, 27 Aug 2014 17:52:15 +0000 (17:52 +0000)]
am
e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev
* commit '
e656975cb7be7e883badf3257a2d66b6e664f5e0':
Fix incorrect reading of multichoice app restrictions
Jeff Sharkey [Wed, 27 Aug 2014 17:47:19 +0000 (10:47 -0700)]
Recreate lib symlink after deleting app data.
Bug:
16739202
Change-Id: Ie8dccf67feaf6dfa474d52a3cda0862b952e6762
Craig Mautner [Wed, 27 Aug 2014 17:40:57 +0000 (17:40 +0000)]
am
b46e78f9: Merge "Revert "Debug for
13924095."" into lmp-dev
* commit '
b46e78f9e04dc7a292be2a3f50d72dc453a2891b':
Revert "Debug for
13924095."
Amith Yamasani [Wed, 27 Aug 2014 17:39:28 +0000 (17:39 +0000)]
Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev
Craig Mautner [Wed, 27 Aug 2014 17:38:50 +0000 (17:38 +0000)]
am
f9af796e: am
a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev
* commit '
f9af796e5ae81a7eb7775d36d6f8278af0fa9920':
When adding an apptoken skip over removed ones.
Christopher Tate [Wed, 27 Aug 2014 17:38:44 +0000 (17:38 +0000)]
am
ef89d312: am
96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev
* commit '
ef89d312499a8332e2d1e7f882a1740448f00f5f':
Remember having done full-data as well as key/value app backups
Amith Yamasani [Wed, 27 Aug 2014 17:33:17 +0000 (10:33 -0700)]
Fix incorrect reading of multichoice app restrictions
Clear the list of choices values before putting new ones in.
Bug:
17299310
Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
Craig Mautner [Wed, 27 Aug 2014 17:29:57 +0000 (17:29 +0000)]
Merge "Revert "Debug for
13924095."" into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 17:24:59 +0000 (10:24 -0700)]
Clear pending operation flag when move failed.
Bug:
17298448
Change-Id: I7a4af0f31d3909a9bfb5a2dd7d168015786024e3
Craig Mautner [Wed, 27 Aug 2014 17:20:31 +0000 (17:20 +0000)]
am
a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev
* commit '
a1ca6e00143dfe8f62c4f888ad8cac79be41d5b4':
When adding an apptoken skip over removed ones.
Christopher Tate [Wed, 27 Aug 2014 17:20:26 +0000 (17:20 +0000)]
am
96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev
* commit '
96c097737bf7874b240f86b313d561fe1f14678e':
Remember having done full-data as well as key/value app backups
Craig Mautner [Wed, 27 Aug 2014 17:14:17 +0000 (17:14 +0000)]
Merge "When adding an apptoken skip over removed ones." into lmp-dev
Julia Reynolds [Wed, 27 Aug 2014 17:13:04 +0000 (17:13 +0000)]
am
68ddd6d9: am
e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev
* commit '
68ddd6d92d3b09b4f6ecdb9621b7997414d501e2':
Limit the settings profile/device owners can update.
Craig Mautner [Wed, 27 Aug 2014 17:05:07 +0000 (17:05 +0000)]
Revert "Debug for
13924095."
This reverts commit
76309cd761a0f9d9e44435ba9a4bde8363ba9f7b.
Logspam no longer useful, just annoying now.
Change-Id: I826d383101077cc1bb341d4a3186ef98ed7e0c00
Christopher Tate [Wed, 27 Aug 2014 17:06:12 +0000 (17:06 +0000)]
Merge "Remember having done full-data as well as key/value app backups" into lmp-dev
Calin Juravle [Wed, 27 Aug 2014 16:59:55 +0000 (16:59 +0000)]
am
d5f23f2e: am
2d3571cc: Merge "Fix the length of a profiler system property"
* commit '
d5f23f2ec0769248d00cfd6e9049cfa354492cce':
Fix the length of a profiler system property
Julia Reynolds [Wed, 27 Aug 2014 16:58:26 +0000 (16:58 +0000)]
am
e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev
* commit '
e21130fde2bc10068620d61c5b87ec4ddcc87760':
Limit the settings profile/device owners can update.
Craig Mautner [Wed, 27 Aug 2014 16:56:02 +0000 (09:56 -0700)]
When adding an apptoken skip over removed ones.
App tokens are passed from the activity manager to the window
manager along with a list insertion position. That insertion
position presumes that all removed tokens are no longer in window
manager's list. However, when removal of a token is delayed due
to ongoing animation the insertion position was pointing to the
wrong location. This fix skips over tokens that have been marked
for removal when inserting new app tokens.
Fixes bug
15751591.
Change-Id: Ib484c591e2bba9f46ad8e47d60ef05c7bfda0a12
Makoto Onuki [Wed, 27 Aug 2014 16:53:14 +0000 (16:53 +0000)]
am
1a8674f1: am
d37368bf: Address API review comments:
* commit '
1a8674f1025336fb6ae1bc28a70fcdfd597a6f15':
Address API review comments:
Joe Fernandez [Wed, 27 Aug 2014 16:53:01 +0000 (16:53 +0000)]
am
2838b622: am
37bd72c6: am
402282f3: am
cafad301: am
82521171: Merge "docs: add warning to redirects file" into klp-modular-docs
* commit '
2838b622ff90fb5dfe5a39a17d9415744181f425':
docs: add warning to redirects file
Julia Reynolds [Wed, 27 Aug 2014 16:49:45 +0000 (16:49 +0000)]
Merge "Limit the settings profile/device owners can update." into lmp-dev
Calin Juravle [Wed, 27 Aug 2014 16:46:27 +0000 (16:46 +0000)]
am
2d3571cc: Merge "Fix the length of a profiler system property"
* commit '
2d3571cc17a5a6b1072951227d889ce14a3f88cf':
Fix the length of a profiler system property
Makoto Onuki [Wed, 27 Aug 2014 16:42:10 +0000 (16:42 +0000)]
am
d37368bf: Address API review comments:
* commit '
d37368bf06dcaf8956cf69198636562b3043d182':
Address API review comments:
Joe Fernandez [Wed, 27 Aug 2014 16:42:06 +0000 (16:42 +0000)]
am
37bd72c6: am
402282f3: am
cafad301: am
82521171: Merge "docs: add warning to redirects file" into klp-modular-docs
* commit '
37bd72c6b74131305ea90af2308afd1aed7b2b98':
docs: add warning to redirects file
Raph Levien [Wed, 27 Aug 2014 16:38:35 +0000 (16:38 +0000)]
am
6dcfc268: am
b73047ff: Merge "New weight-aware font config" into lmp-dev
* commit '
6dcfc268954e2f1f23ccdfda4e6c6aa2c7c5a62d':
New weight-aware font config
Raph Levien [Wed, 27 Aug 2014 16:38:21 +0000 (16:38 +0000)]
am
bdd95259: am
145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev
* commit '
bdd95259eb3ba6614734cd5947773cf61944c8ff':
Fix incorrect return value on missing glyph
Ricardo Cervera [Wed, 27 Aug 2014 16:38:16 +0000 (16:38 +0000)]
am
6c885e6f: am
b37b252a: am
665fc318: am
df139acf: am
1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug:
17195954" into klp-modular-docs
* commit '
6c885e6f315b621e0f496a952bc547b58e7b832d':
docs: Fixed Google Play Services version number. Bug:
17195954
Ricardo Cervera [Wed, 27 Aug 2014 16:38:11 +0000 (16:38 +0000)]
am
300b212c: am
d3288173: am
76428e01: am
37e3f101: am
4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug:
17295924" into klp-modular-docs
* commit '
300b212c8273bd0811ac98a4f2808a0481b315ed':
docs: Changed studio links to HTTPS from HTTP. Bug:
17295924
Ricardo Cervera [Wed, 27 Aug 2014 16:38:06 +0000 (16:38 +0000)]
am
8dd47a7e: am
d7a3ae38: am
1f6a16f1: am
cde64643: am
d91deea5: Merge "docs: Fixed notification background bug. Bug:
16801684" into klp-modular-docs
* commit '
8dd47a7eb7bfc989b337ac9a3ef667ce01a7c9b2':
docs: Fixed notification background bug. Bug:
16801684
Baligh Uddin [Wed, 27 Aug 2014 16:38:00 +0000 (16:38 +0000)]
am
3aa96926: (-s ours) am
7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
3aa969269fb281c5ad4f0327fb350128d49d194c':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:37:56 +0000 (16:37 +0000)]
am
753fcdd4: (-s ours) am
d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
753fcdd48eca0ec38596ce7a9ca08df1430a64af':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:37:51 +0000 (16:37 +0000)]
am
2dd99c5b: (-s ours) am
550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
2dd99c5bad960a971023cca2bb453e4533c18f68':
Import translations. DO NOT MERGE
Calin Juravle [Wed, 27 Aug 2014 16:36:52 +0000 (16:36 +0000)]
Merge "Fix the length of a profiler system property"
Makoto Onuki [Tue, 26 Aug 2014 21:06:30 +0000 (14:06 -0700)]
Address API review comments:
- Rename isCorpContactId() to isEnterpriseContactId().
- Update EXTRA_* constant values.
- Update javadoc on NAME_VERIFIED.
Bug
17253963
Change-Id: I1bef3adbb4125b39129c77cca29c4b8089e1f8cc
Raph Levien [Wed, 27 Aug 2014 16:28:09 +0000 (16:28 +0000)]
am
b73047ff: Merge "New weight-aware font config" into lmp-dev
* commit '
b73047ffc83d9858677e2174c04697502c9d854c':
New weight-aware font config
Joe Fernandez [Wed, 27 Aug 2014 16:28:07 +0000 (16:28 +0000)]
am
402282f3: am
cafad301: am
82521171: Merge "docs: add warning to redirects file" into klp-modular-docs
* commit '
402282f3b5c544a40cc9e19a4c37bfe5277da0ce':
docs: add warning to redirects file
Raph Levien [Wed, 27 Aug 2014 16:28:05 +0000 (16:28 +0000)]
am
145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev
* commit '
145f5780fabc99b36532d4f57a5c99c7eb727d2c':
Fix incorrect return value on missing glyph
Ricardo Cervera [Wed, 27 Aug 2014 16:28:01 +0000 (16:28 +0000)]
am
b37b252a: am
665fc318: am
df139acf: am
1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug:
17195954" into klp-modular-docs
* commit '
b37b252ab8069f7e5442fdcc499334de73ceb0cc':
docs: Fixed Google Play Services version number. Bug:
17195954
Ricardo Cervera [Wed, 27 Aug 2014 16:27:52 +0000 (16:27 +0000)]
am
d3288173: am
76428e01: am
37e3f101: am
4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug:
17295924" into klp-modular-docs
* commit '
d32881732588677f0c6985d11e7e1ef120b9c6c7':
docs: Changed studio links to HTTPS from HTTP. Bug:
17295924
Raph Levien [Wed, 27 Aug 2014 16:24:35 +0000 (16:24 +0000)]
Merge "New weight-aware font config" into lmp-dev
Raph Levien [Wed, 27 Aug 2014 16:24:13 +0000 (16:24 +0000)]
Merge "Fix incorrect return value on missing glyph" into lmp-dev
Ricardo Cervera [Wed, 27 Aug 2014 16:22:14 +0000 (16:22 +0000)]
am
d7a3ae38: am
1f6a16f1: am
cde64643: am
d91deea5: Merge "docs: Fixed notification background bug. Bug:
16801684" into klp-modular-docs
* commit '
d7a3ae3835cb48289dfacb3215594550a9bd8969':
docs: Fixed notification background bug. Bug:
16801684
Baligh Uddin [Wed, 27 Aug 2014 16:22:08 +0000 (16:22 +0000)]
am
7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
7f74dffc181e4cd2d237d85ef29f2bd6a04964da':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:22:04 +0000 (16:22 +0000)]
am
d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
d87aa19b12056d5e9dafc0dd8d34204d9b1bfc05':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:21:59 +0000 (16:21 +0000)]
am
550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
550578f574fc0988c43b0e19a8611f6eab2014db':
Import translations. DO NOT MERGE
Calin Juravle [Wed, 27 Aug 2014 16:18:31 +0000 (16:18 +0000)]
am
2f63f7ab: am
852debcc: Merge "Update the handling of the native bridge property."
* commit '
2f63f7abd390dd2ee16889c047164caac308d101':
Update the handling of the native bridge property.
Calin Juravle [Wed, 27 Aug 2014 16:18:18 +0000 (16:18 +0000)]
am
9dcfcff9: (-s ours) am
3bec87c9: Merge "Pass vmSafeMode (manifest attribute) to installd."
* commit '
9dcfcff9207b57e5bfa87b18f2383a5637f06bbb':
Pass vmSafeMode (manifest attribute) to installd.
Ricardo Cervera [Wed, 27 Aug 2014 16:17:03 +0000 (16:17 +0000)]
am
665fc318: am
df139acf: am
1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug:
17195954" into klp-modular-docs
* commit '
665fc3185d2bda1780ddc9074f46e11777e05405':
docs: Fixed Google Play Services version number. Bug:
17195954
Ricardo Cervera [Wed, 27 Aug 2014 16:16:55 +0000 (16:16 +0000)]
am
76428e01: am
37e3f101: am
4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug:
17295924" into klp-modular-docs
* commit '
76428e01565997f21b6a50bd82088b11f7a1ac15':
docs: Changed studio links to HTTPS from HTTP. Bug:
17295924
Joe Fernandez [Wed, 27 Aug 2014 16:16:13 +0000 (16:16 +0000)]
am
cafad301: am
82521171: Merge "docs: add warning to redirects file" into klp-modular-docs
* commit '
cafad30176ad621f3d943cab942af2187bdec7dc':
docs: add warning to redirects file
Ricardo Cervera [Wed, 27 Aug 2014 16:05:10 +0000 (16:05 +0000)]
am
df139acf: am
1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug:
17195954" into klp-modular-docs
* commit '
df139acff19cdbca43d9cc312653f03463e645ed':
docs: Fixed Google Play Services version number. Bug:
17195954
Ricardo Cervera [Wed, 27 Aug 2014 16:05:05 +0000 (16:05 +0000)]
am
37e3f101: am
4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug:
17295924" into klp-modular-docs
* commit '
37e3f10174bbe0308147323e8fcdf01ae09c5622':
docs: Changed studio links to HTTPS from HTTP. Bug:
17295924