OSDN Git Service
Daichi Hirono [Wed, 13 Jan 2016 04:19:02 +0000 (13:19 +0900)]
Stop listening root change events when the activity is destroyed.
BUG=
26454244
Change-Id: I4be98f21843d6d501dd9c6fc343e905e107fc1c1
Daichi Hirono [Tue, 12 Jan 2016 03:20:45 +0000 (03:20 +0000)]
Merge "Reland "Add event parameters to MtpEvent.""
Jeff Sharkey [Tue, 12 Jan 2016 03:16:22 +0000 (03:16 +0000)]
Merge "Install non-EA providers once user is unlocked."
Daichi Hirono [Mon, 11 Jan 2016 04:33:41 +0000 (13:33 +0900)]
Reland "Add event parameters to MtpEvent."
The CL was previously reviewed at ag/842930.
> We can obtain detailed information of MtpEvent from devices. e.g. object
> handle of changed object. The CL adds the detailed information as
> properties of MtpEvent class.
>
> BUG=
26480986
Change-Id: I93afad9caf118d74cd0923d70242133c4fb2a648
Daichi Hirono [Tue, 12 Jan 2016 02:34:03 +0000 (02:34 +0000)]
Merge "Revert "Add event parameters to MtpEvent.""
Tyler Gunn [Tue, 12 Jan 2016 02:32:19 +0000 (02:32 +0000)]
Merge "Adding @IntDef checking for Video Quality and Video State values."
Daichi Hirono [Tue, 12 Jan 2016 02:31:48 +0000 (02:31 +0000)]
Revert "Add event parameters to MtpEvent."
This reverts commit
592356b63f7446eec2e521a5649e986582183c49.
Change-Id: I9d5eae69c20c914d7946d4e933ada905f428dcb6
Daichi Hirono [Tue, 12 Jan 2016 02:27:46 +0000 (02:27 +0000)]
Merge "Add event parameters to MtpEvent."
Chris Craik [Tue, 12 Jan 2016 02:14:29 +0000 (02:14 +0000)]
Merge "Fix clip serialization crash"
Chris Craik [Tue, 12 Jan 2016 01:50:08 +0000 (17:50 -0800)]
Fix clip serialization crash
Can't safely rewind clip allocations, since those pointers are cached by
ClipArea. Instead add early rejection to handle most cases, and update
tests.
Change-Id: Ic32f95cf95602f427f25761a8da1583c4495f36d
Filip Gruszczynski [Tue, 12 Jan 2016 01:49:12 +0000 (01:49 +0000)]
Merge "Deliver onNewIntent before onResume when launching recents."
Filip Gruszczynski [Tue, 12 Jan 2016 01:15:22 +0000 (17:15 -0800)]
Deliver onNewIntent before onResume when launching recents.
Bug:
25837292
Change-Id: I9da5d2a87c0e33006ef1488dfab5389911955922
Chong Zhang [Tue, 12 Jan 2016 01:39:26 +0000 (01:39 +0000)]
Merge "Apply scroll to windows added to a non-resizeble task that's docked"
Chong Zhang [Tue, 12 Jan 2016 01:14:24 +0000 (17:14 -0800)]
Apply scroll to windows added to a non-resizeble task that's docked
bug:
26447921
Change-Id: I933e277137fb127a9e961035cf48cba2bef52042
Chet Haase [Tue, 12 Jan 2016 00:51:36 +0000 (00:51 +0000)]
Merge "Don't double-set keyframe values when Property exists"
Chet Haase [Tue, 12 Jan 2016 00:27:20 +0000 (16:27 -0800)]
Don't double-set keyframe values when Property exists
There is logic in PVH.setupValue() that sets the value of
the appropriate keyframe from a Property, if that Property object
exists for the animator. But after that is done, it goes ahead and sets
the same keyframe value based on the getter for the target object.
This is not only redundant; it is wrong (in the odd situation in which
a getter would return something different than Property.get()).
The solution is to return early once we've set the value with the
Property object.
Issue #
26471646 PropertyValuesHolder uses reflection in setupValue when a Property is being used
Change-Id: I12634a25661400f13f44872ba17625b32e93ca19
Todd Kennedy [Tue, 5 Jan 2016 23:17:57 +0000 (15:17 -0800)]
Hide ephemerality
Change-Id: Ibf60366b3f00b1920e330cd804bcc1c550f8882a
Bug:
26404647
Yohei Yukawa [Tue, 12 Jan 2016 00:08:39 +0000 (00:08 +0000)]
Merge "Enrich JavaDoc for IC#deleteSurroundingText()."
Filip Gruszczynski [Mon, 11 Jan 2016 23:54:00 +0000 (23:54 +0000)]
Merge "Start recents when bringing docked task to the front."
Winson Chung [Mon, 11 Jan 2016 23:44:55 +0000 (23:44 +0000)]
Merge "Snap docked stack after screen rotation"
Chris Craik [Mon, 11 Jan 2016 23:44:17 +0000 (23:44 +0000)]
Merge "Rename OpReorderer to FrameReorderer"
Filip Gruszczynski [Sat, 9 Jan 2016 00:28:08 +0000 (16:28 -0800)]
Start recents when bringing docked task to the front.
We don't want the docked activity to be on top by itself, so we need to
force the recents to come up to.
Bug:
25838525
Change-Id: Icb8184db5cc67e536561674b887bf481595257cc
Chris Craik [Mon, 11 Jan 2016 22:07:59 +0000 (14:07 -0800)]
Rename OpReorderer to FrameReorderer
Also separate LayerReorderer into its own files.
Change-Id: Iafb6a156f760f62f831f6288fd0dadf1db25da24
Steve McKay [Mon, 11 Jan 2016 23:33:00 +0000 (23:33 +0000)]
Merge "Fix bug where both list and grid buttons are visible."
Chris Craik [Mon, 11 Jan 2016 23:13:28 +0000 (23:13 +0000)]
Merge "Fix path position in BakedOpDispatcher"
George Mount [Mon, 11 Jan 2016 23:12:00 +0000 (23:12 +0000)]
Merge "Change access to action bar to control-<"
Jorim Jaggi [Thu, 31 Dec 2015 09:42:27 +0000 (10:42 +0100)]
Snap docked stack after screen rotation
- Move DividerSnapAlgorithm to com.android.internal, also move
some utility stuff into DividerUtils which is used from both
SystemUI and window manager
- When the screen rotation changes, rotate the stacks like before
but then also snap the docked stack to a valid snap position.
Change-Id: I9e1aa13f42f398a25c9016e6f20395ee212e405b
Aga Wronska [Mon, 11 Jan 2016 23:05:43 +0000 (23:05 +0000)]
Merge "Keep Search View visible after search completed Improve Search View behavior Add Search View background color"
Aga Wronska [Sat, 9 Jan 2016 01:29:24 +0000 (17:29 -0800)]
Keep Search View visible after search completed
Improve Search View behavior
Add Search View background color
Bug:
26143355
Change-Id: Ifdc4bfff56fc6244c571dfbeff4179e1515d53b7
Julia Reynolds [Mon, 11 Jan 2016 21:32:37 +0000 (21:32 +0000)]
Merge "Notification banning updates."
Chris Craik [Mon, 11 Jan 2016 21:24:36 +0000 (13:24 -0800)]
Fix path position in BakedOpDispatcher
Change-Id: I73f4bbcf3fe6f5d3fbdf8058b598bb8f1622097c
John Reck [Mon, 11 Jan 2016 21:18:33 +0000 (21:18 +0000)]
am
0c7532ff: am
e678b41c: Merge "Fix setName use-after-free" into mnc-dev am:
3a79376bb5
am:
eee53e6d39
* commit '
eee53e6d3912220abeea3dfd8b305c051b43eb4e':
Wale Ogunwale [Mon, 11 Jan 2016 21:08:54 +0000 (21:08 +0000)]
Merge "Fixed NPE in Task#isResizeableByDockedStack"
Wale Ogunwale [Mon, 11 Jan 2016 20:24:19 +0000 (12:24 -0800)]
Fixed NPE in Task#isResizeableByDockedStack
It is possible for the DisplayContent to be null.
Change-Id: I0a85038ae71a24fb5613237d771bc9222dd61cde
Shreyas Basarge [Thu, 17 Dec 2015 15:16:36 +0000 (15:16 +0000)]
Flex time for periodic jobs in JobScheduler
A periodic job will start only within time
satisfying period - flex < time % period < period.
Bug:
26254850
Change-Id: I97a840446e5592e5151d784800855d909f1790b8
Chong Zhang [Mon, 11 Jan 2016 20:42:34 +0000 (20:42 +0000)]
Merge "Fix black screen when launching app from Recents into non-docked area"
Chong Zhang [Mon, 11 Jan 2016 20:23:51 +0000 (12:23 -0800)]
Fix black screen when launching app from Recents into non-docked area
In this case, we're putting the app into a fullscreen stack that is
resized due to docked stack. When setting up the thumbnail scale up
animation, we have to treat this case as animating into freeform window,
as the containing frame will not be fullscreen, and it's not a clip
rect. For freeform windows, we set up scaling and translation, and
don't change the clip rect.
bug:
26435476
Change-Id: Ic1ac71bfc814afd62572027fa11663c80d903a2d
Philip P. Moltmann [Mon, 11 Jan 2016 20:22:40 +0000 (20:22 +0000)]
Merge "Do not add far favorite printers more than once."
Philip P. Moltmann [Mon, 11 Jan 2016 20:22:10 +0000 (20:22 +0000)]
Merge "ApprovedServices might be null, handle the case:"
Winson Chung [Mon, 11 Jan 2016 20:18:47 +0000 (20:18 +0000)]
Merge "Simplifying the task header highlight drawing."
Tingting Wang [Mon, 11 Jan 2016 20:18:37 +0000 (20:18 +0000)]
Merge "Remove @hide for CONTACT_METADATA_SYNC."
Winson [Sat, 9 Jan 2016 00:06:50 +0000 (16:06 -0800)]
Simplifying the task header highlight drawing.
- Removed unused ripple logic in the task header background, simplifying
the background and highlight drawing
- Calculating the header highlight from the actual task color now
- Preventing some extra work from happening when the task view size
changes
Change-Id: I775651f4b9ce8c1cdfa6fb3d77fd6912fd99a93b
Winson [Sat, 9 Jan 2016 00:40:30 +0000 (16:40 -0800)]
Removing HW layers for task view transitions.
Change-Id: I00377e12d779519bd0fc102480d37382b3ac4ea6
Winson [Thu, 7 Jan 2016 23:34:13 +0000 (15:34 -0800)]
Fixing regression in initial task bounds animating into Overview.
Change-Id: I09e76c97515dd7e38f8696ac6c48016c9d0a5263
Winson [Fri, 8 Jan 2016 19:19:21 +0000 (11:19 -0800)]
Prevent docking via nav bar until user is set up.
- Also prevents docking if screen pinning is currently active.
- Fixes issue where you could go into recents when setting up a
secondary user.
Bug:
26438797
Bug:
26316912
Change-Id: I30576b52842b76184ef0b2252bc572f74a5d6db8
Winson [Fri, 8 Jan 2016 18:32:08 +0000 (10:32 -0800)]
Removing code to animate thumbnail scale now that we animate bounds.
- This CL reverts the code to the previous state where we can just
calculate the thumbnail scale from the view bounds.
Change-Id: I156ae915af76055b5177a6bdf0f929bdf6acea01
Jason Monk [Mon, 11 Jan 2016 19:55:53 +0000 (19:55 +0000)]
Merge "Fix build"
Philip P. Moltmann [Mon, 11 Jan 2016 19:41:55 +0000 (19:41 +0000)]
Merge "In rare cases the printing client app might have been dieded before remotePrintDocument.start(). In this case the print spooler should not crash."
Philip P. Moltmann [Mon, 11 Jan 2016 19:41:25 +0000 (19:41 +0000)]
Merge "Display toast when print services are disabled."
Jason Monk [Mon, 11 Jan 2016 19:37:44 +0000 (14:37 -0500)]
Fix build
Fix bad merge
Change-Id: I2cd1f32a7e50b8fa1f7f85c52fe34111f7cea577
Jason Monk [Fri, 8 Jan 2016 19:12:18 +0000 (14:12 -0500)]
Move battery saver notification to QS
Remove the battery saver notification and instead create a detail
panel within QS that allows it to be turned on and off.
Change-Id: I54654d26183586fa171fda04877a840701f8ef33
Rob Carr [Mon, 11 Jan 2016 19:18:25 +0000 (19:18 +0000)]
Merge "Implement surfaceRedrawNeeded for GLSurfaceView"
Tingting Wang [Mon, 11 Jan 2016 18:58:02 +0000 (10:58 -0800)]
Remove @hide for CONTACT_METADATA_SYNC.
Make Contacts App access this flag.
BUG
26491409
Change-Id: I440cb540fbcc5dd3722ecb6e335dd40914cc30b5
Jeremy Klein [Mon, 11 Jan 2016 19:10:22 +0000 (19:10 +0000)]
Merge "Add a TETHER_PRIVILEGED permission and use it where needed."
Jose Lima [Mon, 11 Jan 2016 19:06:42 +0000 (19:06 +0000)]
am
bb9045ea: am
5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev am:
57b7573210
am:
e54704461e
* commit '
e54704461e02437f83ddc7ed432c345d3cec1e9f':
Steve McKay [Mon, 11 Jan 2016 19:05:00 +0000 (19:05 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Steve McKay [Mon, 11 Jan 2016 19:04:00 +0000 (19:04 +0000)]
am
c05605ae: am
5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am:
c226801a43
am:
2dbf679cf0
* commit '
2dbf679cf080df06e5340ea4bb766ea4f1aa1956':
Steve McKay [Mon, 11 Jan 2016 19:01:55 +0000 (19:01 +0000)]
am
c05605ae: am
5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am:
c226801a43
am:
2dbf679cf0
* commit '
2dbf679cf080df06e5340ea4bb766ea4f1aa1956':
Geoff Mendal [Mon, 11 Jan 2016 18:59:56 +0000 (18:59 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Mon, 11 Jan 2016 18:59:02 +0000 (18:59 +0000)]
am
ffdbf7da: (-s ours) am
cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am:
f68020abf3 -s ours
am:
44ad3ac50a -s ours
* commit '
44ad3ac50aca8ec2fc23ad1ac9defdc1446d518b':
Xiaohui Chen [Mon, 11 Jan 2016 18:58:14 +0000 (18:58 +0000)]
Merge "sysui: refactor out PanelHolder"
Andrew Flynn [Mon, 11 Jan 2016 18:56:38 +0000 (18:56 +0000)]
am
10dced7a: am
ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev am:
4aa8c7df2e
am:
dfe384fed8
* commit '
dfe384fed881eaab1d7585fb4e23edfab0823c33':
Victor Chan [Mon, 11 Jan 2016 18:55:22 +0000 (18:55 +0000)]
Merge "Null check mRecentsComponent and mDivider."
John Reck [Mon, 11 Jan 2016 18:53:03 +0000 (18:53 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
John Reck [Mon, 11 Jan 2016 18:52:10 +0000 (18:52 +0000)]
am
cc8418fc: am
1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev am:
dd447382cd
am:
aa768491c3
* commit '
aa768491c3463849df9f3e52ff37e6d9136271af':
Jeff Davidson [Mon, 11 Jan 2016 18:51:20 +0000 (18:51 +0000)]
Merge "Define new APIs for metering and roaming network stats buckets."
John Reck [Mon, 11 Jan 2016 18:50:49 +0000 (18:50 +0000)]
am
0c7532ff: am
e678b41c: Merge "Fix setName use-after-free" into mnc-dev
am:
3a79376bb5
* commit '
3a79376bb5c0f50863295b51544dbf811180682d':
Jose Lima [Mon, 11 Jan 2016 18:48:01 +0000 (18:48 +0000)]
am
bb9045ea: am
5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev
am:
57b7573210
* commit '
57b7573210750ead5c6a5d6a8ebd41d8e61636ec':
Geoff Mendal [Mon, 11 Jan 2016 18:48:01 +0000 (18:48 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Mon, 11 Jan 2016 18:46:53 +0000 (18:46 +0000)]
am
577e34c9: (-s ours) am
3f2f2cbb: (-s ours) Import translations. DO NOT MERGE am:
896262ef52 -s ours
am:
625b8124a0 -s ours
* commit '
625b8124a03a2bec5bc168ab27777263a3f8e114':
Tor Norbye [Mon, 11 Jan 2016 18:46:10 +0000 (18:46 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Tor Norbye [Mon, 11 Jan 2016 18:45:08 +0000 (18:45 +0000)]
am
7a560701: am
335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev am:
20ccf13fbc
am:
a4f3fa62a3
* commit '
a4f3fa62a36a0bcb0dfc3adae54bb802084cd690':
Steve McKay [Mon, 11 Jan 2016 18:44:59 +0000 (18:44 +0000)]
am
c05605ae: am
5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev
am:
c226801a43
* commit '
c226801a43c17d41e59988adbb77fd06f2f77c9d':
Adam Lesinski [Mon, 11 Jan 2016 18:44:58 +0000 (18:44 +0000)]
Merge "AAPT2: Warn when positional arguments exist and --legacy is on"
Gustav Sennton [Mon, 11 Jan 2016 18:43:05 +0000 (18:43 +0000)]
Merge "Fix WebView loading logic to allow changing provider if current disabled"
Adam Lesinski [Mon, 11 Jan 2016 18:42:19 +0000 (10:42 -0800)]
AAPT2: Warn when positional arguments exist and --legacy is on
This is normally an error, but old AAPT didn't check for it correctly,
so many projects violate this. With --legacy, this becomes a warning.
Change-Id: I23647e029930e11b719591cd38609e1b43247e20
Geoff Mendal [Mon, 11 Jan 2016 18:41:56 +0000 (18:41 +0000)]
am
ffdbf7da: (-s ours) am
cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am:
f68020abf3 -s ours
* commit '
f68020abf3a51ffefcf3cd8d2043684501b6f3ce':
Lorenzo Colitti [Mon, 11 Jan 2016 18:40:55 +0000 (18:40 +0000)]
am
e0c29e8e: am
0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev am:
1c562bbb61
am:
a4486aa875
* commit '
a4486aa875e8908b6527da9958e556651fc33ccf':
Matthew Williams [Mon, 11 Jan 2016 18:39:22 +0000 (18:39 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Andrew Flynn [Mon, 11 Jan 2016 18:39:12 +0000 (18:39 +0000)]
am
10dced7a: am
ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev
am:
4aa8c7df2e
* commit '
4aa8c7df2e09892c305cf9984ecf1916fa034e7f':
Matthew Williams [Mon, 11 Jan 2016 18:38:16 +0000 (18:38 +0000)]
am
c341c1f7: am
303650c9: Add full backup criteria to android manifest am:
ead811790e
am:
33265de780
* commit '
33265de780b47e5cbc9924236e368f33d43257ee':
John Reck [Mon, 11 Jan 2016 18:36:18 +0000 (18:36 +0000)]
am
01b321de: am
05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev
am:
0b1c17bd31
* commit '
0b1c17bd314ab093e8455077b1740e30b6189c02':
Matthew Williams [Mon, 11 Jan 2016 18:36:15 +0000 (18:36 +0000)]
am
c341c1f7: am
303650c9: Add full backup criteria to android manifest am:
ead811790e
am:
33265de780
* commit '
33265de780b47e5cbc9924236e368f33d43257ee':
Svet Ganov [Mon, 11 Jan 2016 18:34:19 +0000 (18:34 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Svet Ganov [Mon, 11 Jan 2016 18:33:19 +0000 (18:33 +0000)]
am
6a67cd45: am
ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev am:
a938239f33
am:
6f094f575e
* commit '
6f094f575e8d42a08e7c9423662fb6c04f12b5fb':
John Reck [Mon, 11 Jan 2016 18:33:15 +0000 (18:33 +0000)]
am
cc8418fc: am
1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
am:
dd447382cd
* commit '
dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5':
Svet Ganov [Mon, 11 Jan 2016 18:31:18 +0000 (18:31 +0000)]
am
6a67cd45: am
ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev am:
a938239f33
am:
6f094f575e
* commit '
6f094f575e8d42a08e7c9423662fb6c04f12b5fb':
Tor Norbye [Mon, 11 Jan 2016 18:30:26 +0000 (18:30 +0000)]
am
7a560701: am
335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev
am:
20ccf13fbc
* commit '
20ccf13fbc685b96a8b1d4a59452143bec4fd711':
Geoff Mendal [Mon, 11 Jan 2016 18:27:30 +0000 (18:27 +0000)]
am
577e34c9: (-s ours) am
3f2f2cbb: (-s ours) Import translations. DO NOT MERGE
am:
896262ef52 -s ours
* commit '
896262ef52c5de199d1ab3e59cab4f8efc2e37e8':
Svetoslav [Mon, 11 Jan 2016 18:26:44 +0000 (18:26 +0000)]
am
0f74977b: am
e9fc4cda: Merge "Add camera app op - framework" into mnc-dev am:
4e71319952
am:
857e778b8b
* commit '
857e778b8bc5c552ebf51953273bb99b6dfe1f91':
Lorenzo Colitti [Mon, 11 Jan 2016 18:24:55 +0000 (18:24 +0000)]
am
e0c29e8e: am
0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev
am:
1c562bbb61
* commit '
1c562bbb610ef83f328b53d88e4958383aea824c':
Deepanshu Gupta [Mon, 11 Jan 2016 18:23:50 +0000 (18:23 +0000)]
Merge "Fix ninepatch scaling." into mnc-ub-dev am:
0c08fc0fc5
am:
2aebcddf02
* commit '
2aebcddf02383c84a8a21279d32fd00376b8c25e':
Fix ninepatch scaling.
Jerome Gaillard [Mon, 11 Jan 2016 18:22:05 +0000 (18:22 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Matthew Williams [Mon, 11 Jan 2016 18:22:01 +0000 (18:22 +0000)]
am
c341c1f7: am
303650c9: Add full backup criteria to android manifest
am:
ead811790e
* commit '
ead811790e11432e994260e879edc16aa4f45297':
Jerome Gaillard [Mon, 11 Jan 2016 18:20:35 +0000 (18:20 +0000)]
Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev am:
171a2a9322
am:
1bddf2b19d
* commit '
1bddf2b19dbfc3f1edc540a5aaaacd84f8831412':
Get color state list file content from PSI instead of disk
Svet Ganov [Mon, 11 Jan 2016 18:19:08 +0000 (18:19 +0000)]
am
6a67cd45: am
ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev
am:
a938239f33
* commit '
a938239f33f2fc615cb8e1813eb6a9773ff16c96':
Geoff Mendal [Mon, 11 Jan 2016 18:19:08 +0000 (18:19 +0000)]
am
44acc73e: (-s ours) am
6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am:
d6a9daa65e -s ours
am:
ffaba5f3ec -s ours
* commit '
ffaba5f3ece78d84dae8daeeb21ad6faa76e697d':
Svetoslav [Mon, 11 Jan 2016 18:16:09 +0000 (18:16 +0000)]
am
0f74977b: am
e9fc4cda: Merge "Add camera app op - framework" into mnc-dev
am:
4e71319952
* commit '
4e713199526b1ddc8c8a1a518eff0d19e44a145d':
Lajos Molnar [Mon, 11 Jan 2016 18:15:19 +0000 (18:15 +0000)]
am
6a667c6f: am
4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev am:
fe96c1891e
am:
18e8be647d
* commit '
18e8be647d9c235608c41fe065641fe7fcc43698':
Deepanshu Gupta [Mon, 11 Jan 2016 18:15:01 +0000 (18:15 +0000)]
Merge "Fix ninepatch scaling." into mnc-ub-dev
am:
0c08fc0fc5
* commit '
0c08fc0fc58be4f52527d7a0529960752056e83b':
Fix ninepatch scaling.