OSDN Git Service
Zhijun He [Thu, 17 Apr 2014 20:40:18 +0000 (20:40 +0000)]
Merge "Camera2: Update sync.frameNumber tag"
Zhijun He [Thu, 17 Apr 2014 20:20:21 +0000 (13:20 -0700)]
Camera2: Update sync.frameNumber tag
This is from the type mismapping bug fix in metadata generation.
Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
Jorim Jaggi [Thu, 17 Apr 2014 19:57:25 +0000 (19:57 +0000)]
Merge "Move bouncer to the bottom, but only on phones."
Jorim Jaggi [Thu, 17 Apr 2014 19:44:53 +0000 (21:44 +0200)]
Move bouncer to the bottom, but only on phones.
Change-Id: Ibe03964a10a8cab9e179ff0618a6ed312c8b1b4a
Jason Sams [Thu, 17 Apr 2014 19:36:40 +0000 (19:36 +0000)]
am
5170476c: am
a4af5726: am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
5170476c5bf470b57616380aa7b15b44e5a24bea':
Add BiCubic resize instrinsic
Baligh Uddin [Thu, 17 Apr 2014 19:36:15 +0000 (19:36 +0000)]
am
177d9b9a: (-s ours) am
b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
177d9b9a25296d9cbe0f96497a8abf2fe28aa1da':
Import translations. DO NOT MERGE
Griff Hazen [Thu, 17 Apr 2014 19:36:04 +0000 (19:36 +0000)]
am
84f4adc9: Merge commit \'
59dfbb91\' into klp-modular-dev-plus-aosp
* commit '
84f4adc9a5e3cc818ed972dc7fecbafb131a779a':
Fix build [DO NOT MERGE]
Scott Main [Thu, 17 Apr 2014 19:35:31 +0000 (19:35 +0000)]
am
2b7345e4: am
b04f3f74: am
cb38ee51: am
a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '
2b7345e4e3eaa7fcf2f24ba4d03ae00a265adedc':
add image itemprop to specify image for search result snippet
Ricardo Cervera [Thu, 17 Apr 2014 19:35:20 +0000 (19:35 +0000)]
am
f162266c: am
f64feec2: am
4aa68e97: am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
f162266cc44aa83e6a5b95fc4f629c80cf603416':
docs: Watermark images with easter eggs
Raph Levien [Thu, 17 Apr 2014 19:21:14 +0000 (19:21 +0000)]
Merge changes Ia693f512,If3b7d41f
* changes:
Enable elegant text metrics in Quantum theme
Add elegantTextHeight text appearance attribute
Jorim Jaggi [Thu, 17 Apr 2014 19:08:37 +0000 (19:08 +0000)]
Merge "Fix global screen rotation issue."
Jorim Jaggi [Thu, 17 Apr 2014 18:36:15 +0000 (20:36 +0200)]
Fix global screen rotation issue.
Bug:
14080683
Change-Id: I0144faafa0e01c14c8c8e6a6c9fc81a10d25f47d
Jorim Jaggi [Thu, 17 Apr 2014 18:23:05 +0000 (18:23 +0000)]
Merge "Fix not being able to unlock SIM PIN."
Jorim Jaggi [Thu, 17 Apr 2014 18:17:30 +0000 (20:17 +0200)]
Fix not being able to unlock SIM PIN.
Bug:
14120902
Change-Id: I812d9679000242eabea617ea75cf8355d16926b2
Raph Levien [Mon, 14 Apr 2014 21:38:51 +0000 (14:38 -0700)]
Enable elegant text metrics in Quantum theme
This changes the default quantum theme to use elegant text metrics,
which make use of a bit of extra vertical space to better render complex
scripts. It depends on the new elegantMetrics text attribute being
available.
Change-Id: Ia693f5129057fe8b9a633609c72eef388b988fea
Raph Levien [Mon, 14 Apr 2014 21:11:02 +0000 (14:11 -0700)]
Add elegantTextHeight text appearance attribute
This patch adds an elegantTextHeight text appearance attribute and
plumbs it through to the paint. This attribute selects the elegant
variant of fonts (when appropriate, which is typically Arabic and indic
scripts), and also specifies larger vertical metrics, to avoid clipping.
The intent is for this to be the default for quantum themes, but this
patch doesn't change any default behavior, just adds the attribute.
The larger vertical metrics are applied to top and bottom, but should
not affect line spacing in the common case. Also, with the setting,
metrics are no longer dependent on the font, so setting a custom font
will preserve layout and spacing.
Change-Id: If3b7d41f141deff50ca078f479ca90c2aa07829a
Alan Viverette [Thu, 17 Apr 2014 18:06:57 +0000 (18:06 +0000)]
Merge changes Ia2bf4d17,I8242523d
* changes:
Fix alert dialog alignment and touch feedback masking
Fix VectorDrawable states
Leon Scroggins [Thu, 17 Apr 2014 17:25:22 +0000 (17:25 +0000)]
Merge "Call SkShader::isOpaque() to determine opaqueness."
Jason Sams [Thu, 17 Apr 2014 17:07:48 +0000 (17:07 +0000)]
am
a4af5726: am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
a4af5726c4c8c882ca65a049bfa824922609d464':
Add BiCubic resize instrinsic
Chris Craik [Thu, 17 Apr 2014 17:06:22 +0000 (17:06 +0000)]
Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG""
Ji-Hwan Lee [Thu, 17 Apr 2014 17:04:24 +0000 (17:04 +0000)]
Merge "Minor fix to remove verbose logcat output in SyncStorageEngine"
Jason Sams [Thu, 17 Apr 2014 17:02:10 +0000 (17:02 +0000)]
am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
112d1b94ee8456dba16842e6b964eb35aef95818':
Add BiCubic resize instrinsic
George Mount [Thu, 17 Apr 2014 16:51:59 +0000 (16:51 +0000)]
Merge "Split Activity Transitions out of PhoneWindow."
George Mount [Tue, 25 Mar 2014 00:44:36 +0000 (17:44 -0700)]
Split Activity Transitions out of PhoneWindow.
Bug
13622834
Made it possible to use shared elements without making
Views invisible.
Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
Chris Craik [Thu, 17 Apr 2014 16:37:23 +0000 (16:37 +0000)]
Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
This reverts commit
39b7353acacf08a3c0204a9ec122fff420e53310.
Change-Id: I732eab8a2843dd23c86bd1526ec95db5352d39a0
Chris Craik [Thu, 17 Apr 2014 16:31:16 +0000 (16:31 +0000)]
Merge "Deprecate color array drawBitmap methods"
Chris Craik [Thu, 17 Apr 2014 16:30:26 +0000 (16:30 +0000)]
Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
Robin Lee [Thu, 17 Apr 2014 15:54:53 +0000 (15:54 +0000)]
Merge "Allow ProfileOwner apps to manage app restrictions"
Baligh Uddin [Thu, 17 Apr 2014 15:53:11 +0000 (15:53 +0000)]
am
b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b279f5272e2c7554aeab930ba0aabab12efff9e2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 15:48:52 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:50 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:48 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:45 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:38 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 17 Apr 2014 15:48:36 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:31 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:29 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:22 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Robin Lee [Wed, 9 Apr 2014 15:44:21 +0000 (16:44 +0100)]
Allow ProfileOwner apps to manage app restrictions
Simple wrapper around the UserManager.{get|set}ApplicationRestrictions
APIs. Also added a new Intent to signal to running apps that the set
of restrictions has changed since startup.
Change-Id: Ifd108108a73f87325b499d9de2e1b2aacc59b264
John Spurlock [Thu, 17 Apr 2014 14:38:05 +0000 (14:38 +0000)]
Merge "Interim quick settings update."
John Spurlock [Tue, 15 Apr 2014 20:14:46 +0000 (16:14 -0400)]
Interim quick settings update.
Make existing QS panel available via pulldown from header
(or keyguard status view on keyguard), update the affordances
as a hint.
Don't allow QS to scroll, cap to max rows.
Add scrim over panel to indicate that this is purely temporary.
Bug:
14081801
Bug:
14059974
Change-Id: I166033975cbc44b91f45ee70ea5c7540390670dd
Skia_Android Canary Bot [Wed, 16 Apr 2014 23:06:52 +0000 (19:06 -0400)]
Call SkShader::isOpaque() to determine opaqueness.
It is invalid to call SkShader::getFlags() before calling
SkShader::setContext() - it will always return 0. Instead, call
SkShader::isOpaque().
Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
Adrian Roos [Thu, 17 Apr 2014 13:54:57 +0000 (13:54 +0000)]
Merge "Fix broken status bar when activity is showing above keyguard"
Adrian Roos [Thu, 17 Apr 2014 13:46:41 +0000 (15:46 +0200)]
Fix broken status bar when activity is showing above keyguard
Bug:
14077213
Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
Adrian Roos [Thu, 17 Apr 2014 13:09:41 +0000 (15:09 +0200)]
Make camera affordance fly away
Stop gap measure to differenciate the accepted vs rejected
response of the camera affordance on the lockscreen.
Bug:
14081010
Change-Id: I04d170aa3f07ce5f440fb1d27f7c62ef2a903a03
Griff Hazen [Thu, 17 Apr 2014 09:53:18 +0000 (02:53 -0700)]
Merge commit '
59dfbb91' into klp-modular-dev-plus-aosp
Remove all changes from the merge to stop propagation.
Conflicts:
tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java
Deepanshu Gupta [Thu, 17 Apr 2014 07:14:28 +0000 (00:14 -0700)]
Fix build [DO NOT MERGE]
The branch is missing some CLs for 64-bit support. So, until they are
added, this change will fix the build.
Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66
Ji-Hwan Lee [Thu, 17 Apr 2014 05:16:38 +0000 (14:16 +0900)]
Minor fix to remove verbose logcat output in SyncStorageEngine
Change-Id: I93b936202a99338329e73a41d4c1651369ecb70f
Sungsoo Lim [Thu, 17 Apr 2014 04:53:43 +0000 (04:53 +0000)]
Merge "Replace sessionStateMap with sessionTokens."
Sungsoo Lim [Sat, 12 Apr 2014 07:51:27 +0000 (16:51 +0900)]
Replace sessionStateMap with sessionTokens.
Change-Id: I6ec3390ca31cd17da35f0b0b83b1b09600d7d6d1
John Reck [Thu, 17 Apr 2014 04:36:51 +0000 (04:36 +0000)]
Merge "Add missing resume() call"
John Reck [Thu, 17 Apr 2014 04:33:15 +0000 (04:33 +0000)]
Merge "Clear mIgnoreDirtyState after draw"
John Reck [Thu, 17 Apr 2014 04:31:25 +0000 (21:31 -0700)]
Add missing resume() call
Bug:
14087850
Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
John Reck [Thu, 17 Apr 2014 01:59:21 +0000 (18:59 -0700)]
Clear mIgnoreDirtyState after draw
Change-Id: I6dfb39e0ebc9a5732678d735d9bc5e8813926096
Chris Craik [Thu, 17 Apr 2014 01:53:07 +0000 (18:53 -0700)]
Deprecate color array drawBitmap methods
Change-Id: I3339214ddaa7a32e9ddbbb1a074fa98e393eaadf
Jason Sams [Thu, 17 Apr 2014 01:22:18 +0000 (01:22 +0000)]
Merge "Add BiCubic resize instrinsic"
Chris Craik [Wed, 16 Apr 2014 22:35:50 +0000 (15:35 -0700)]
Add convenience methods, to encourage usage of ALL_SAVE_FLAG
Change-Id: I29aefd70071ff49a259db5c06dded3cd531f6ef1
Alan Viverette [Thu, 17 Apr 2014 00:56:29 +0000 (17:56 -0700)]
Fix alert dialog alignment and touch feedback masking
BUG:
13905057
Change-Id: Ia2bf4d170370c83f4ea863ecae24fffecc6fc020
Scott Main [Thu, 17 Apr 2014 00:28:17 +0000 (00:28 +0000)]
am
b04f3f74: am
cb38ee51: am
a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '
b04f3f749b565ca075066bbc1fe89153941eaa65':
add image itemprop to specify image for search result snippet
Scott Main [Thu, 17 Apr 2014 00:22:02 +0000 (00:22 +0000)]
am
cb38ee51: am
a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '
cb38ee510abed0112aa47cb2da6bfe182400f321':
add image itemprop to specify image for search result snippet
Scott Main [Thu, 17 Apr 2014 00:16:54 +0000 (00:16 +0000)]
am
a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '
a106923e9add041f73ccf5f46e8584ea4302c54c':
add image itemprop to specify image for search result snippet
Scott Main [Thu, 17 Apr 2014 00:14:47 +0000 (00:14 +0000)]
Merge "add image itemprop to specify image for search result snippet" into klp-docs
Jason Sams [Thu, 17 Apr 2014 00:13:09 +0000 (17:13 -0700)]
Add BiCubic resize instrinsic
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
Ricardo Cervera [Thu, 17 Apr 2014 00:08:41 +0000 (00:08 +0000)]
am
f64feec2: am
4aa68e97: am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
f64feec253d0c8a124f8ab16954bf71b1f3c3e92':
docs: Watermark images with easter eggs
Ricardo Cervera [Thu, 17 Apr 2014 00:03:33 +0000 (00:03 +0000)]
am
4aa68e97: am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
4aa68e9799bf56bd5a35a1a49b512bbafce8f5df':
docs: Watermark images with easter eggs
Jason Sams [Thu, 17 Apr 2014 00:00:06 +0000 (00:00 +0000)]
am
a09695f5: (-s ours) am
38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev
* commit '
a09695f59c06256663f3a46546fbcdd6da10f180':
RenderScript bicubic resize intrinsic [DO NOT MERGE]
Alan Viverette [Wed, 16 Apr 2014 23:57:53 +0000 (16:57 -0700)]
Fix VectorDrawable states
BUG:
14083130
Change-Id: I8242523d9a4acd499154d2e7b9b9b52a3f1f742d
Ricardo Cervera [Wed, 16 Apr 2014 23:58:36 +0000 (23:58 +0000)]
am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
dc9ca02c51ecc4468e60c391f8357b5025d6eef1':
docs: Watermark images with easter eggs
Scott Main [Wed, 16 Apr 2014 23:57:21 +0000 (16:57 -0700)]
add image itemprop to specify image for search result snippet
Change-Id: I8c0ed12268318124bdb944db9048fc73284823f9
Aaron Whyte [Wed, 16 Apr 2014 23:56:07 +0000 (23:56 +0000)]
am
ee5d512d: am
4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev
* commit '
ee5d512d624c15fa0c7e179ace24c7055a9f539d':
Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
Jason Sams [Wed, 16 Apr 2014 23:54:22 +0000 (23:54 +0000)]
am
38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev
* commit '
38f407cb1daca91af82943c931593d11a6c84b1c':
RenderScript bicubic resize intrinsic [DO NOT MERGE]
Jason Sams [Wed, 16 Apr 2014 23:49:29 +0000 (23:49 +0000)]
Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev
Aaron Whyte [Wed, 16 Apr 2014 23:49:20 +0000 (23:49 +0000)]
am
4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev
* commit '
4980996bcc4e8065cf5dff1cf989d73face38281':
Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
Alan Viverette [Wed, 16 Apr 2014 23:48:31 +0000 (23:48 +0000)]
Merge "Clean up VectorDrawable formatting"
Aaron Whyte [Wed, 16 Apr 2014 23:45:22 +0000 (23:45 +0000)]
Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev
Jason Sams [Wed, 16 Apr 2014 23:41:01 +0000 (16:41 -0700)]
RenderScript bicubic resize intrinsic [DO NOT MERGE]
Change-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a
Ruben Brunk [Wed, 16 Apr 2014 23:36:21 +0000 (23:36 +0000)]
Merge "Update DNG tags."
Adam Powell [Wed, 16 Apr 2014 23:27:00 +0000 (23:27 +0000)]
am
3d678ad4: (-s ours) am
973ddaac: DO NOT MERGE Add isRound to WindowInsets
* commit '
3d678ad462ee237d86efd9d985eb518817761e05':
DO NOT MERGE Add isRound to WindowInsets
Alan Viverette [Wed, 16 Apr 2014 23:24:00 +0000 (16:24 -0700)]
Clean up VectorDrawable formatting
Change-Id: I9110f6ddeda9a811e466e58e451fa95eca08e72e
Adam Powell [Wed, 16 Apr 2014 23:23:02 +0000 (23:23 +0000)]
am
973ddaac: DO NOT MERGE Add isRound to WindowInsets
* commit '
973ddaacaef255b8659d35cfe4151dd5b7436138':
DO NOT MERGE Add isRound to WindowInsets
Fabrice Di Meglio [Wed, 16 Apr 2014 23:20:26 +0000 (23:20 +0000)]
Merge "Add Preference highlighting"
Adam Powell [Wed, 16 Apr 2014 23:16:50 +0000 (23:16 +0000)]
Merge "Revert the revert of adding isRound to WindowInsets after early merge"
Adam Powell [Wed, 16 Apr 2014 23:14:57 +0000 (23:14 +0000)]
Revert the revert of adding isRound to WindowInsets after early merge
This reverts commit
01ebfbd0a0a3a89b563ab6c8c346c669eca39a1a.
Change-Id: I3d5a3523a1505cc3bfd0172c7282a8eda21ae206
Ruben Brunk [Wed, 16 Apr 2014 06:53:53 +0000 (23:53 -0700)]
Update DNG tags.
Change-Id: I497b0fac5d52005c126eaf52c67d30bd224a80b5
Fabrice Di Meglio [Wed, 16 Apr 2014 02:15:20 +0000 (19:15 -0700)]
Add Preference highlighting
- use a specific drawable for highlighting a Preference
at a given position
- also add PreferenceFragment.hasListView() as hidden API
Change-Id: If69854cf6c4852d0f45e2c3a9734b1f63b352f9d
Michael Kolb [Wed, 16 Apr 2014 22:52:31 +0000 (22:52 +0000)]
Merge "Revert "Add isRound to WindowInsets""
Michael Kolb [Wed, 16 Apr 2014 22:52:14 +0000 (22:52 +0000)]
Revert "Add isRound to WindowInsets"
This reverts commit
e5244b5638535964103ca1dfc867442a64243db1.
Change-Id: I6371c718e2189968699e980fd0e7ba91c486aca6
Michael Kolb [Wed, 16 Apr 2014 22:51:32 +0000 (22:51 +0000)]
Merge "Add isRound to WindowInsets"
Baligh Uddin [Wed, 16 Apr 2014 22:17:04 +0000 (15:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I192157eeea4a9fd359d2d4c1662a153454242ad5
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 22:13:43 +0000 (15:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic128b66fb70754adff7faa7f505f907dea499a68
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 22:06:32 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ice08934e78e95e0c229189902366db69498d82fa
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 22:00:17 +0000 (15:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I57057544950fecf92d0462ce93f3365660fe8810
Auto-generated-cl: translation import
Adam Powell [Wed, 16 Apr 2014 00:38:54 +0000 (17:38 -0700)]
DO NOT MERGE Add isRound to WindowInsets
isRound allows a view to determine whether the window it is contained
within obscures the corners of the window content. This allows views
aware of this property to adapt their layout accordingly.
Switch ViewRootImpl to use dispatchApplyInsets instead of
fitSystemWindows.
Change-Id: Ic3e3936b73815b2593cb9720af1a309fbd18406e
Conflicts:
core/java/android/view/ViewRootImpl.java
Jorim Jaggi [Wed, 16 Apr 2014 21:55:55 +0000 (21:55 +0000)]
Merge "Make MENU key work again to dismiss insecure Keyguard."
Jorim Jaggi [Wed, 16 Apr 2014 21:55:39 +0000 (21:55 +0000)]
Merge "Show enter PIN/PUK before notifications on Keyguard."
Deepanshu Gupta [Wed, 16 Apr 2014 21:54:04 +0000 (21:54 +0000)]
am
cf72f259: Fix incorrect merge conflict to klp-modular-dev-plus-aosp
* commit '
cf72f25981606b4e48130890f22f713d41e0d420':
Fix incorrect merge conflict to klp-modular-dev-plus-aosp
Aaron Whyte [Fri, 11 Apr 2014 17:53:58 +0000 (10:53 -0700)]
Allowed custom secure-adb confirmation via Activity or Service.
It used to only be available via an Activity.
Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
Deepanshu Gupta [Wed, 16 Apr 2014 21:37:06 +0000 (14:37 -0700)]
Fix incorrect merge conflict to klp-modular-dev-plus-aosp
resolved conflicts for merge of
ec6676dd to klp-modular-dev-plus-aosp
properly, originally fixed in
35d46778f49c962c990cfc17e521aa80b9e0c016
Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
Baligh Uddin [Wed, 16 Apr 2014 21:32:46 +0000 (14:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d61ecf2601689f2598a8430fd4ea7b0d4ab80a8
Auto-generated-cl: translation import
Jeff Davidson [Wed, 16 Apr 2014 21:32:06 +0000 (21:32 +0000)]
Merge "Class for managing the active scorer application."
OSDN Git Service
