OSDN Git Service
Jae Seo [Tue, 3 Jun 2014 17:17:00 +0000 (17:17 +0000)]
am
594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev
* commit '
594ac1575f8301023d37c329f8c676ba9bda396c':
TvContract: Address the feedback from the API review
Sungsoo Lim [Tue, 3 Jun 2014 17:16:49 +0000 (17:16 +0000)]
am
61e4b1cf: Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev
* commit '
61e4b1cf302ea659329952dfcebffb2f387bff3f':
Add ClientState for handling the crash of clients.
Alan Viverette [Tue, 3 Jun 2014 17:16:43 +0000 (17:16 +0000)]
Chulwoo Lee [Tue, 3 Jun 2014 17:16:33 +0000 (17:16 +0000)]
am
b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev
* commit '
b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93':
Add a way to get the class name of SetupActivity and SettingsActivity
Alan Viverette [Tue, 3 Jun 2014 17:16:27 +0000 (17:16 +0000)]
am
25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev
* commit '
25931adee5ba954220190f48901bb66c8c9dd462':
Clean up drawable theming APIs
Dianne Hackborn [Tue, 3 Jun 2014 17:16:01 +0000 (17:16 +0000)]
am
da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev
* commit '
da4a186f8bf49d8ea06d5ad6d402d9b073ee3841':
Some battery stats history fixes.
Raph Levien [Tue, 3 Jun 2014 17:15:56 +0000 (17:15 +0000)]
am
faa91203: Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev
* commit '
faa912037ca4895eb99155a4a53354435ee413c2':
Support fallbacks for custom typefaces (Minikin)
George Mount [Tue, 3 Jun 2014 17:15:47 +0000 (17:15 +0000)]
am
5a745332: Merge "Delay sending shared element position until after layout." into lmp-preview-dev
* commit '
5a745332b3e5bac89052484e2ae4978a9a1e1bcd':
Delay sending shared element position until after layout.
Adam Powell [Tue, 3 Jun 2014 17:15:34 +0000 (17:15 +0000)]
am
ef7c0948: Merge "Add an internal method for setting optical insets." into lmp-preview-dev
* commit '
ef7c0948ea1379ee9f3f5f40267ca2cf5e76a36b':
Add an internal method for setting optical insets.
Jorim Jaggi [Tue, 3 Jun 2014 17:15:26 +0000 (17:15 +0000)]
am
a0437d35: Merge "Hide header when notifications collide with it on Keyguard." into lmp-preview-dev
* commit '
a0437d355a853adb5023ab0885952620d0cf4f07':
Hide header when notifications collide with it on Keyguard.
Raph Levien [Tue, 3 Jun 2014 17:15:21 +0000 (17:15 +0000)]
am
8e3605e4: Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev
* commit '
8e3605e4de5a109792acca22c37976ac52ee571e':
Check for NULL on TypefaceImpl unref
Nicolas Prevot [Tue, 3 Jun 2014 17:08:50 +0000 (17:08 +0000)]
Merge "Adding user consent extras to DevicePolicyManager."
Nicolas Prevot [Tue, 27 May 2014 17:22:35 +0000 (18:22 +0100)]
Adding user consent extras to DevicePolicyManager.
Adding ACTION_PROVISIONING_USER_HAS_CONSENTED and EXTRA_PROVISIONING_TOKEN to DevicePolicyManager.
They can be used to tell ManagedProvisioning to skip user consent.
Change-Id: I5ef8ab2a14969bb29a2ee3dbdce5ca3225e0759a
Jae Seo [Tue, 3 Jun 2014 17:03:46 +0000 (10:03 -0700)]
resolved conflicts for merge of
ebe661c4 to master
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
ztenghui [Tue, 3 Jun 2014 16:03:36 +0000 (16:03 +0000)]
Merge "Add the tree hierarchy for the group"
Nicolas Prevot [Tue, 3 Jun 2014 14:52:58 +0000 (14:52 +0000)]
Merge "Updating the pictures and labels for cross-profile intents."
John Reck [Tue, 3 Jun 2014 14:42:52 +0000 (07:42 -0700)]
fix build
Change-Id: I7fbe80ab0fbbc857c5785034a3c4129bccdec41c
John Reck [Tue, 3 Jun 2014 14:27:26 +0000 (14:27 +0000)]
Merge "Remove GLRenderer"
Narayan Kamath [Tue, 3 Jun 2014 14:11:55 +0000 (14:11 +0000)]
Narayan Kamath [Tue, 3 Jun 2014 14:08:51 +0000 (14:08 +0000)]
Narayan Kamath [Tue, 3 Jun 2014 13:58:35 +0000 (13:58 +0000)]
am
dd2e9d33: am
7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
* commit '
dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab':
Scan for renderscript files before deciding ABIs.
Narayan Kamath [Tue, 3 Jun 2014 13:58:30 +0000 (13:58 +0000)]
am
797b109c: (-s ours) am
7ed98c43: Merge "Add an --abi argument to "pm install""
* commit '
797b109c60bda8e122075b0c2101d3f2a0b67c07':
Add an --abi argument to "pm install"
Narayan Kamath [Tue, 3 Jun 2014 13:56:03 +0000 (13:56 +0000)]
Merge "Fix build."
Narayan Kamath [Tue, 3 Jun 2014 13:54:36 +0000 (14:54 +0100)]
Fix build.
Bad resolution of a manual rebase.
Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
Narayan Kamath [Tue, 3 Jun 2014 13:29:04 +0000 (13:29 +0000)]
am
41aa48be: am
032c5c05: Merge "Log process abis during start."
* commit '
41aa48beacc93a1511a290e91293402eeb787165':
Log process abis during start.
Narayan Kamath [Tue, 3 Jun 2014 13:24:50 +0000 (13:24 +0000)]
am
7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
* commit '
7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
Scan for renderscript files before deciding ABIs.
Narayan Kamath [Tue, 3 Jun 2014 13:24:45 +0000 (13:24 +0000)]
am
7ed98c43: Merge "Add an --abi argument to "pm install""
* commit '
7ed98c43f8cbcfbb4862205a72455ab39359a011':
Add an --abi argument to "pm install"
Narayan Kamath [Tue, 3 Jun 2014 13:24:34 +0000 (13:24 +0000)]
am
032c5c05: Merge "Log process abis during start."
* commit '
032c5c054c331b63f2d45ee9c497ac852faec633':
Log process abis during start.
Narayan Kamath [Tue, 3 Jun 2014 12:20:05 +0000 (12:20 +0000)]
Merge "Scan for renderscript files before deciding ABIs."
Narayan Kamath [Tue, 3 Jun 2014 12:01:53 +0000 (12:01 +0000)]
Merge "Add an --abi argument to "pm install""
Narayan Kamath [Fri, 16 May 2014 15:45:56 +0000 (16:45 +0100)]
Scan for renderscript files before deciding ABIs.
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.
bug:
14900093
Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
Lorenzo Colitti [Tue, 3 Jun 2014 11:58:23 +0000 (11:58 +0000)]
Merge "Fix Legacy NetworkInfo API"
Narayan Kamath [Tue, 3 Jun 2014 11:10:01 +0000 (11:10 +0000)]
Merge "Add an --abi argument to "pm install""
Robert Greenwalt [Mon, 2 Jun 2014 22:32:02 +0000 (15:32 -0700)]
Fix Legacy NetworkInfo API
Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.
bug:
15290306
bug:
15191336
bug:
14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
Adrian Roos [Tue, 3 Jun 2014 10:46:43 +0000 (10:46 +0000)]
Merge "Remove now defunct touch analysis facility"
Narayan Kamath [Thu, 29 May 2014 10:51:59 +0000 (11:51 +0100)]
Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.
bug:
14453227
(cherry picked from commit
6431d11cd420536aaa9d93ae510a3151ccc4df1d)
Change-Id: I85d4f8785deea02a6a4d3cb0b05e6ef8bf64826b
Yuncheol Heo [Tue, 3 Jun 2014 10:12:52 +0000 (10:12 +0000)]
Merge "Add SystemAudioAction(FromAvr|FromTv)."
Narayan Kamath [Thu, 29 May 2014 10:51:59 +0000 (11:51 +0100)]
Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.
Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
Yuncheol Heo [Tue, 27 May 2014 14:06:01 +0000 (23:06 +0900)]
Add SystemAudioAction(FromAvr|FromTv).
The system audio can be initiated by Tv itself or by AVR through
<Set System Audio Mode> CEC message.
This CL also includes:
- Add HdmiConstants, HdmiUtil class to handle various constants and
utility functions.
- Add default message dispatcher to all queued actions.
- Add an argument on HdmiControlService.removeAction(class) to prevent
from removing the caller itself.
Change-Id: I9fd9089bed876f04b58c483879b64edfae94a298
Narayan Kamath [Tue, 3 Jun 2014 09:57:02 +0000 (09:57 +0000)]
Merge "Log process abis during start."
Christopher Tate [Tue, 3 Jun 2014 02:10:54 +0000 (19:10 -0700)]
Finish migration of backup transport constants
...and make sure to fix a couple of lingering Javadoc references.
Bug
15329632
Change-Id: I1de7b53a58940834cd2dae2301fd5f65dbb48ba6
Christopher Tate [Tue, 3 Jun 2014 02:07:01 +0000 (02:07 +0000)]
Merge "Add full-backup stream API to BackupTransport"
Christopher Tate [Tue, 3 Jun 2014 01:54:18 +0000 (18:54 -0700)]
Add full-backup stream API to BackupTransport
Also started migrating the definition of transport success/failure constants
into BackupTransport to make them permanent.
The new methods are not yet plumbed in; this is just to allow forward
progress against a proposed stable API.
Bug
15329632
Change-Id: I27472e09b831350c140b9fa548ebda3af334eb1a
Robert Greenwalt [Tue, 3 Jun 2014 01:11:00 +0000 (01:11 +0000)]
Merge "Refactor NetworkFactory."
Yohei Yukawa [Tue, 3 Jun 2014 00:51:31 +0000 (00:51 +0000)]
Merge "Reenable DynamicRotationList for language-switching-aware IMEs"
Jae Seo [Tue, 3 Jun 2014 00:26:05 +0000 (00:26 +0000)]
Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev
Sungsoo Lim [Tue, 3 Jun 2014 00:23:07 +0000 (00:23 +0000)]
Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev
ztenghui [Wed, 28 May 2014 22:02:35 +0000 (15:02 -0700)]
Add the tree hierarchy for the group
bug:
15288554
Change-Id: I7caedb8466d078a0d9a6148e00d02eded4a4d234
Alan Viverette [Tue, 3 Jun 2014 00:12:58 +0000 (17:12 -0700)]
Fix build
Change-Id: I09c649b3385ed46956f2d784546c430298de3069
Sungsoo Lim [Wed, 14 May 2014 00:21:08 +0000 (09:21 +0900)]
Add ClientState for handling the crash of clients.
Bug:
15054040
Change-Id: I4dd8d1c350186fe705daa20c9944bc8e4dd556c2
Chulwoo Lee [Mon, 2 Jun 2014 23:59:55 +0000 (23:59 +0000)]
Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev
Chulwoo Lee [Tue, 27 May 2014 05:10:37 +0000 (14:10 +0900)]
Add a way to get the class name of SetupActivity and SettingsActivity
Now, there can be only one SetupActivity and one SettingsActivity for
one TIS apk though one TIS apk can contain several services. Each TIS
need to be able to have its own SetupActivity and SettingsActivity.
BUG:
15177340
Change-Id: I2d944e3ef35c3a981483ba643fd27b15925bab16
Yuhao Zheng [Mon, 2 Jun 2014 23:54:11 +0000 (23:54 +0000)]
Merge "WifiService and WifiPasspointService hook up"
Yuhao Zheng [Sat, 31 May 2014 01:54:55 +0000 (18:54 -0700)]
WifiService and WifiPasspointService hook up
- add a reference to passpoint service in wifi state machine
- break dependency loop at boot phase
Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba
Jae Seo [Sun, 1 Jun 2014 00:20:01 +0000 (17:20 -0700)]
TvContract: Address the feedback from the API review
This change addresses the following comments from the council:
- Provider authority should be "android.media.tv"
- Rename COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA and add comment to
indicate data is internal to the provider that inserted it, and should
not be decoded by other apps. It would be nice to restrict read access
to this column, but not essential.
- Hide COLUMN_LOCKED since implementation isn't defined yet, also
questions about how it interacts with Unicorn.
- Fix typo in ORIGINAL_NETWORK documentation.
- All provider MIME types need to be changed to follow platform
conventions: "vnd.android.cursor.dir/channel",
"vnd.android.cursor.dir/program", etc. (Notice singular tense and no
package prefixes since they're part of the platform API.)
- Rename Programs.COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA, along
with docs update, for the same reasons as above.
- Rename COLUMN_DESCRIPTION to COLUMN_SHORT_DESCRIPTION and update docs
to indicate it's a recommended maximum length, not a hard cap.
- COLUMN_GENRE should be split into two columns: COLUMN_BROADCAST_GENRE
(from broadcast standard) and COLUMN_CANONICAL_GENRE (from an Android
standard). Define a subclass with the Android canonical genres, which
are simple strings that are comma-separated when inserted into
COLUMN_CANONICAL_GENRE.
Bug:
15345342
Change-Id: I7f8e70aef617475a59d096fd73a551e7df8a1d3a
Alan Viverette [Mon, 2 Jun 2014 23:41:59 +0000 (23:41 +0000)]
Merge "Clean up drawable theming APIs" into lmp-preview-dev
Alan Viverette [Mon, 2 Jun 2014 23:39:04 +0000 (16:39 -0700)]
Clean up drawable theming APIs
Removes APIs for themed creation of a drawable from a stream, since
that doesn't involve any inflation. Also cleans up tinting methods
left over from previous clean up.
BUG:
15089957
Change-Id: I2af7aa9a6d351ae61b33ee1216c674fae1bffe11
Signed-off-by: Alan Viverette <alanv@google.com>
John Reck [Fri, 30 May 2014 21:34:03 +0000 (14:34 -0700)]
Remove GLRenderer
Change-Id: I180286417c1a354fc7eb1eadb1884ac6add0795c
Jinsuk Kim [Mon, 2 Jun 2014 23:24:55 +0000 (23:24 +0000)]
Merge "Added missing entries in the cec device array"
Robert Greenwalt [Tue, 27 May 2014 20:20:24 +0000 (13:20 -0700)]
Refactor NetworkFactory.
Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use. Then NetworkAgent is created and destroyed as needed with very simple logic.
Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
Robert Greenwalt [Mon, 2 Jun 2014 23:12:29 +0000 (23:12 +0000)]
Merge "Rewrite startUsingNetworkFeature for new API"
Dianne Hackborn [Mon, 2 Jun 2014 22:57:40 +0000 (22:57 +0000)]
Merge "Some battery stats history fixes." into lmp-preview-dev
Raph Levien [Mon, 2 Jun 2014 22:54:58 +0000 (22:54 +0000)]
Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev
John Reck [Mon, 2 Jun 2014 22:44:49 +0000 (22:44 +0000)]
Merge "Cleanup"
George Mount [Mon, 2 Jun 2014 22:42:44 +0000 (22:42 +0000)]
Merge "Delay sending shared element position until after layout." into lmp-preview-dev
John Reck [Mon, 2 Jun 2014 22:12:36 +0000 (15:12 -0700)]
Cleanup
Change-Id: Ie366390272724a2c1dfda99b0e85806b7a612744
Fabrice Di Meglio [Mon, 2 Jun 2014 22:10:36 +0000 (22:10 +0000)]
am
f3c294df: Merge "Code cleaning" into lmp-preview-dev
* commit '
f3c294df46bab8f50bead51e70f562778b8c5deb':
Code cleaning
Fabrice Di Meglio [Mon, 2 Jun 2014 22:10:31 +0000 (22:10 +0000)]
am
8dead81f: Merge "Code cleaning" into lmp-preview-dev
* commit '
8dead81f3b1548d0d3f84a585b389baf8d415e99':
Code cleaning
Craig Mautner [Mon, 2 Jun 2014 22:10:30 +0000 (22:10 +0000)]
am
39317b97: Merge "Compare task userId with userId profiles." into lmp-preview-dev
* commit '
39317b9742cf796557583f6678a7443a991414f7':
Compare task userId with userId profiles.
Vinit Deshpande [Mon, 2 Jun 2014 22:10:30 +0000 (22:10 +0000)]
am
357a441e: (-s ours) Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev
* commit '
357a441e5be26a642238e2fd13e88f35f6e25a65':
DO NOT MERGE: Accomoditing API Review feedback for WifiScanner
John Spurlock [Mon, 2 Jun 2014 22:10:29 +0000 (22:10 +0000)]
am
20d26282: Merge "Update global actions bug report item." into lmp-preview-dev
* commit '
20d26282b31dcd7f7d258c3878f15b42211b23d0':
Update global actions bug report item.
Adrian Roos [Mon, 2 Jun 2014 15:57:07 +0000 (17:57 +0200)]
Remove now defunct touch analysis facility
Bug:
15381470
Change-Id: I2ab252e4c0122d79c9a78b3df643bfd46a105cf0
Adam Powell [Mon, 2 Jun 2014 21:36:55 +0000 (21:36 +0000)]
Merge "Add an internal method for setting optical insets." into lmp-preview-dev
Jorim Jaggi [Mon, 2 Jun 2014 21:35:04 +0000 (21:35 +0000)]
Merge "Hide header when notifications collide with it on Keyguard." into lmp-preview-dev
Jorim Jaggi [Mon, 2 Jun 2014 20:47:42 +0000 (22:47 +0200)]
Hide header when notifications collide with it on Keyguard.
Bug:
15163546
Change-Id: If4f39786916df75537959a8104823353c475448f
Adam Powell [Mon, 2 Jun 2014 21:24:47 +0000 (14:24 -0700)]
Add an internal method for setting optical insets.
This will allow views to calculate their own optical insets
e.g. during measurement. Candidate for public API down the road once
it proves itself for framework views.
Change-Id: I098d7b7b52e5aaf7eccc8ef34d79791d127d8c77
Raph Levien [Mon, 2 Jun 2014 21:17:49 +0000 (21:17 +0000)]
Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev
Jae Seo [Mon, 2 Jun 2014 21:03:58 +0000 (21:03 +0000)]
Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev
Fabrice Di Meglio [Mon, 2 Jun 2014 20:50:42 +0000 (20:50 +0000)]
Merge "Code cleaning" into lmp-preview-dev
Fabrice Di Meglio [Mon, 2 Jun 2014 20:49:37 +0000 (20:49 +0000)]
Merge "Code cleaning" into lmp-preview-dev
Craig Mautner [Mon, 2 Jun 2014 20:40:16 +0000 (20:40 +0000)]
Merge "Compare task userId with userId profiles." into lmp-preview-dev
George Mount [Mon, 2 Jun 2014 14:22:59 +0000 (07:22 -0700)]
Delay sending shared element position until after layout.
Bug
15380396
Also updated fade duration to 300ms now that shared element
transition can take place before fade.
Change-Id: I9053615c83b9e0938b015645de0eb6c1534cbb34
Raph Levien [Mon, 2 Jun 2014 20:37:34 +0000 (13:37 -0700)]
Check for NULL on TypefaceImpl unref
It's possible for a TypefaceImpl to contain a null pointer, which was
causing crashes on unref. This patch just checks for NULL.
Fixes bug
15104801 "Aviate Launcher crashes on startup - Hammerhead L
AAV49B"
Change-Id: Idf9f176c54bf81ff3daacc0b33e95aa9d8bbe57f
vandwalle [Mon, 2 Jun 2014 20:03:13 +0000 (20:03 +0000)]
Merge "handle removal of self added configurations"
Vinit Deshpande [Mon, 2 Jun 2014 20:00:12 +0000 (20:00 +0000)]
Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev
Dianne Hackborn [Mon, 2 Jun 2014 19:42:12 +0000 (12:42 -0700)]
Some battery stats history fixes.
- Now the full wake history uses the history tag if it can.
Hopefully this will still result in a consistent history,
since that isn't really want the tag is for... but the
current implementation in places will probably make this work.
- Possibly fix a bug with inconsistent state between partial
history snapshots: after a snapshot is printed, don't allow
any more batching into the most recent history entry, so the
next snapshot will not miss anything that might get placed
into it soon after.
Also rework command line arguments for enable/disable to make these
commands instead of options.
Change-Id: Ia33445cad1538bf8df549cef284f1e736efbc079
John Spurlock [Mon, 2 Jun 2014 19:17:35 +0000 (19:17 +0000)]
Merge "Update global actions bug report item." into lmp-preview-dev
John Spurlock [Mon, 2 Jun 2014 18:10:41 +0000 (14:10 -0400)]
Update global actions bug report item.
New icon, update title to match confirm dialog, new status
line for build information.
Remove redundant QS tile.
Bug:
15385554
Change-Id: Idc36dc9ce1cabfa61fd8acac56dc3a70d5dc6645
Yuhao Zheng [Mon, 2 Jun 2014 18:38:45 +0000 (18:38 +0000)]
Merge "More ANQP parsing"
Mike Lockwood [Mon, 2 Jun 2014 18:32:26 +0000 (18:32 +0000)]
am
a0183b02: am
8868d129: am
1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '
a0183b02e4c6f53587519b445a546192b4a20146':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Mike Lockwood [Mon, 2 Jun 2014 18:32:20 +0000 (18:32 +0000)]
am
1ac54ec6: am
750e78bb: am
27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '
1ac54ec69bfcda2638b05c7daa4300ec5749e7b8':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
Mike Lockwood [Mon, 2 Jun 2014 18:28:51 +0000 (18:28 +0000)]
am
8868d129: am
1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '
8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Mike Lockwood [Mon, 2 Jun 2014 18:28:42 +0000 (18:28 +0000)]
am
750e78bb: am
27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '
750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
Mike Lockwood [Mon, 2 Jun 2014 18:25:35 +0000 (18:25 +0000)]
am
1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '
1c725866da02c3e1f62fb416ea3450caed406f2a':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Mike Lockwood [Mon, 2 Jun 2014 18:25:28 +0000 (18:25 +0000)]
am
27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '
27eb205e21e7715764084085f382d690e0406c63':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
Mike Lockwood [Mon, 2 Jun 2014 18:21:17 +0000 (18:21 +0000)]
Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
Mike Lockwood [Mon, 2 Jun 2014 18:20:39 +0000 (18:20 +0000)]
Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
John Reck [Mon, 2 Jun 2014 18:19:44 +0000 (18:19 +0000)]
am
feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev
* commit '
feccbdc4d0bee3eb4c395bd93ba51cbc6616527a':
Add setStartValue to RNA
John Reck [Mon, 2 Jun 2014 18:13:13 +0000 (18:13 +0000)]
Merge "Add setStartValue to RNA" into lmp-preview-dev
Raph Levien [Mon, 2 Jun 2014 18:08:19 +0000 (18:08 +0000)]
am
dfc40743: Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev
* commit '
dfc40743fda406614a2200a31e8a670b7fa46cd8':
Revert ascent/descent/lineGap of Roboto to Roboto v1 values