Andrew Flynn
|
dfe384fed8
|
am 10dced7a: am ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev
am: 4aa8c7df2e
* commit '4aa8c7df2e09892c305cf9984ecf1916fa034e7f':
|
2016-01-11 18:39:12 +00:00 |
|
Matthew Williams
|
25d55cc793
|
am c341c1f7: am 303650c9: Add full backup criteria to android manifest am: ead811790e
am: 33265de780
* commit '33265de780b47e5cbc9924236e368f33d43257ee':
|
2016-01-11 18:38:16 +00:00 |
|
John Reck
|
173c0352a5
|
am 01b321de: am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev
am: 0b1c17bd31
* commit '0b1c17bd314ab093e8455077b1740e30b6189c02':
|
2016-01-11 18:36:18 +00:00 |
|
Matthew Williams
|
2dc5875d77
|
am c341c1f7: am 303650c9: Add full backup criteria to android manifest am: ead811790e
am: 33265de780
* commit '33265de780b47e5cbc9924236e368f33d43257ee':
|
2016-01-11 18:36:15 +00:00 |
|
Svet Ganov
|
280d048acf
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2016-01-11 18:34:19 +00:00 |
|
Svet Ganov
|
4d56fb6bc8
|
am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev am: a938239f33
am: 6f094f575e
* commit '6f094f575e8d42a08e7c9423662fb6c04f12b5fb':
|
2016-01-11 18:33:19 +00:00 |
|
John Reck
|
aa768491c3
|
am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
am: dd447382cd
* commit 'dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5':
|
2016-01-11 18:33:15 +00:00 |
|
Svet Ganov
|
a1528534d9
|
am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev am: a938239f33
am: 6f094f575e
* commit '6f094f575e8d42a08e7c9423662fb6c04f12b5fb':
|
2016-01-11 18:31:18 +00:00 |
|
Tor Norbye
|
a4f3fa62a3
|
am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev
am: 20ccf13fbc
* commit '20ccf13fbc685b96a8b1d4a59452143bec4fd711':
|
2016-01-11 18:30:26 +00:00 |
|
Geoff Mendal
|
625b8124a0
|
am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE
am: 896262ef52 -s ours
* commit '896262ef52c5de199d1ab3e59cab4f8efc2e37e8':
|
2016-01-11 18:27:30 +00:00 |
|
Svetoslav
|
c211280609
|
am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev am: 4e71319952
am: 857e778b8b
* commit '857e778b8bc5c552ebf51953273bb99b6dfe1f91':
|
2016-01-11 18:26:44 +00:00 |
|
Lorenzo Colitti
|
a4486aa875
|
am e0c29e8e: am 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev
am: 1c562bbb61
* commit '1c562bbb610ef83f328b53d88e4958383aea824c':
|
2016-01-11 18:24:55 +00:00 |
|
Deepanshu Gupta
|
0beaeadbe3
|
Merge "Fix ninepatch scaling." into mnc-ub-dev am: 0c08fc0fc5
am: 2aebcddf02
* commit '2aebcddf02383c84a8a21279d32fd00376b8c25e':
Fix ninepatch scaling.
|
2016-01-11 18:23:50 +00:00 |
|
Jerome Gaillard
|
27f28509a6
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2016-01-11 18:22:05 +00:00 |
|
Matthew Williams
|
33265de780
|
am c341c1f7: am 303650c9: Add full backup criteria to android manifest
am: ead811790e
* commit 'ead811790e11432e994260e879edc16aa4f45297':
|
2016-01-11 18:22:01 +00:00 |
|
Jerome Gaillard
|
63ebf34d6d
|
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
|
2016-01-11 18:20:35 +00:00 |
|
Svet Ganov
|
6f094f575e
|
am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev
am: a938239f33
* commit 'a938239f33f2fc615cb8e1813eb6a9773ff16c96':
|
2016-01-11 18:19:08 +00:00 |
|
Geoff Mendal
|
307ed40360
|
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':
|
2016-01-11 18:19:08 +00:00 |
|
Svetoslav
|
857e778b8b
|
am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev
am: 4e71319952
* commit '4e713199526b1ddc8c8a1a518eff0d19e44a145d':
|
2016-01-11 18:16:09 +00:00 |
|
Lajos Molnar
|
f8642182b7
|
am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev am: fe96c1891e
am: 18e8be647d
* commit '18e8be647d9c235608c41fe065641fe7fcc43698':
|
2016-01-11 18:15:19 +00:00 |
|
Deepanshu Gupta
|
2aebcddf02
|
Merge "Fix ninepatch scaling." into mnc-ub-dev
am: 0c08fc0fc5
* commit '0c08fc0fc58be4f52527d7a0529960752056e83b':
Fix ninepatch scaling.
|
2016-01-11 18:15:01 +00:00 |
|
Mike Lockwood
|
99c413c743
|
am 32624f29: am 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev
am: 37ba571347
* commit '37ba57134777a82227e3e12a958111d7f37beb48':
|
2016-01-11 18:13:06 +00:00 |
|
Chong Zhang
|
07a85951c4
|
am a77578d3: am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev am: 4d3a3429d2
am: 137fba0db3
* commit '137fba0db389b6f343e9f9d6f5e9f1268a768e15':
|
2016-01-11 18:10:36 +00:00 |
|
Jerome Gaillard
|
1bddf2b19d
|
Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev
am: 171a2a9322
* commit '171a2a932234cdbc25ab672c5ea2285adb6eca84':
Get color state list file content from PSI instead of disk
|
2016-01-11 18:10:30 +00:00 |
|
Deepanshu Gupta
|
0c08fc0fc5
|
Merge "Fix ninepatch scaling." into mnc-ub-dev
|
2016-01-11 18:09:45 +00:00 |
|
Geoff Mendal
|
1c3098e627
|
am e647500f: (-s ours) am 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am: b38f599221 -s ours
* commit 'b38f599221e1bc56ca9bb9f510f7f8ec4495e1d2':
|
2016-01-11 18:09:31 +00:00 |
|
Chong Zhang
|
3f918f5279
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2016-01-11 18:08:39 +00:00 |
|
Chong Zhang
|
56a221a9d9
|
am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev am: 0e3758333d
am: fb1f9993a7
* commit 'fb1f9993a742d0f8a46cba7e795f66324d57a334':
|
2016-01-11 18:07:38 +00:00 |
|
Geoff Mendal
|
ffaba5f3ec
|
am 44acc73e: (-s ours) am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am: d6a9daa65e -s ours
* commit 'd6a9daa65e9237914f8877fd6d9a6965e1e39147':
|
2016-01-11 18:06:29 +00:00 |
|
Jerome Gaillard
|
171a2a9322
|
Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev
|
2016-01-11 18:06:10 +00:00 |
|
Chong Zhang
|
0e37b1dbaf
|
am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev am: 0e3758333d
am: fb1f9993a7
* commit 'fb1f9993a742d0f8a46cba7e795f66324d57a334':
|
2016-01-11 18:05:13 +00:00 |
|
Lajos Molnar
|
18e8be647d
|
am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev
am: fe96c1891e
* commit 'fe96c1891e42a408247ff6bf8827b3c8ffb68f83':
|
2016-01-11 18:03:08 +00:00 |
|
Chris Tate
|
07c0abf4cc
|
am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job." am: 20fb8187c4
am: f46d500984
* commit 'f46d500984e2a6eb18a153d0ca41a0f8851d2e60':
|
2016-01-11 18:02:51 +00:00 |
|
Bryce Lee
|
0606ff6a16
|
am 176987b7: am 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev am: 520b550564
am: 582a9c6002
* commit '582a9c60029c7f59b545803d2d7fe16115d93c71':
|
2016-01-11 18:00:24 +00:00 |
|
Chong Zhang
|
137fba0db3
|
am a77578d3: am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev
am: 4d3a3429d2
* commit '4d3a3429d2dced2a93fa02054fb34d2107e0364a':
|
2016-01-11 18:00:05 +00:00 |
|
Rich Slogar
|
b0dbff455d
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2016-01-11 17:58:47 +00:00 |
|
Rich Slogar
|
50aef84dbd
|
am 1705b2fd: am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs am: 40d0be81b7
am: a56653bb6f
* commit 'a56653bb6f0462bfdd3ae5ae6e31a62d10366354':
|
2016-01-11 17:57:33 +00:00 |
|
Chong Zhang
|
0628607494
|
am 1228e72b: am 03359161: MediaRecorder: implement persistent input surface APIs
am: 970be8a6eb
* commit '970be8a6eb3f1b35dee85fb26b8a49976795bfb6':
|
2016-01-11 17:55:55 +00:00 |
|
Rich Slogar
|
fbe351ce91
|
am 1705b2fd: am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs am: 40d0be81b7
am: a56653bb6f
* commit 'a56653bb6f0462bfdd3ae5ae6e31a62d10366354':
|
2016-01-11 17:55:53 +00:00 |
|
Winson Chung
|
d0b0fa16a3
|
Merge "Revert "Snap docked stack after screen rotation""
|
2016-01-11 17:53:40 +00:00 |
|
Winson Chung
|
3dc52ed179
|
Revert "Snap docked stack after screen rotation"
This reverts commit e65d6bb2072471e63b93aa14a288bc59ed86208f.
Change-Id: I245aa9be3ea98ff742e02b02f6f1d344bc2e8182
|
2016-01-11 17:53:17 +00:00 |
|
Chong Zhang
|
fb1f9993a7
|
am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev
am: 0e3758333d
* commit '0e3758333de98de24b8cbb2f05fc1b53e182aa9e':
|
2016-01-11 17:52:55 +00:00 |
|
Rich Slogar
|
51df6b88f4
|
am 3daee8a7: am d8417f12: am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs am: e36725b358
am: 6e5ccba67c
* commit '6e5ccba67c16e1ea3166412014bca3cc9cae4069':
|
2016-01-11 17:52:04 +00:00 |
|
Chris Tate
|
f46d500984
|
am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job."
am: 20fb8187c4
* commit '20fb8187c41cf0fd926620b9734b9211ce0c8306':
Fix NPE in JobServiceContext when closing job.
|
2016-01-11 17:50:56 +00:00 |
|
Raph Levien
|
c9480eeec9
|
am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev am: 151ccb9f58
am: 34a2b84520
* commit '34a2b84520dfae696eea1ea939ff59a0c7e117b1':
|
2016-01-11 17:49:50 +00:00 |
|
Roozbeh Pournader
|
a514b63749
|
Merge "Support properly setting and getting LocaleLists"
|
2016-01-11 17:48:53 +00:00 |
|
Bryce Lee
|
582a9c6002
|
am 176987b7: am 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev
am: 520b550564
* commit '520b550564d9a640de655e10995a4007e836c1fa':
|
2016-01-11 17:48:10 +00:00 |
|
Yohei Yukawa
|
7111232533
|
am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java. am: f436e6e848
am: e19d54239a
* commit 'e19d54239a0fcd4070a5075f0c5da4b324f33fd9':
|
2016-01-11 17:46:06 +00:00 |
|
Rich Slogar
|
a56653bb6f
|
am 1705b2fd: am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
am: 40d0be81b7
* commit '40d0be81b720774bb05330952cfdb2d64c371a35':
|
2016-01-11 17:45:52 +00:00 |
|
Svet Ganov
|
ed98649d80
|
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
|
2016-01-11 17:44:10 +00:00 |
|