Andrew Sapperstein
4832092503
Merge \"Properly tint crash dialog.\" into nyc-mr1-dev
...
am: 44d909c971
2016-06-24 20:53:04 +00:00
TreeHugger Robot
44d909c971
Merge "Properly tint crash dialog." into nyc-mr1-dev
2016-06-24 20:45:56 +00:00
Mitchell Wills
48a2b01de0
Merge \"Don\'t save the anonymous identity for EAP-SIM/AKA/AKA-Prime\" into nyc-mr1-dev
...
am: 015c8a3ac0
2016-06-24 20:31:44 +00:00
Mitchell Wills
015c8a3ac0
Merge "Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime" into nyc-mr1-dev
2016-06-24 20:24:13 +00:00
Android Build Merger (Role)
709edf7ac5
Merge "Reapply more strings for \\"more settings\\" am: de383c75eb am: 0dfa15fd05" into nyc-mr1-dev-plus-aosp
2016-06-24 20:17:35 +00:00
Mitchell Wills
a464a9fce8
Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime
...
wpa_supplicant can update this value when authenticating so if the
framework writes it back the new value can be overwritten.
TEST: Patch was validated by original reporter
Enterprise tests pass (b/29608435)
Change-Id: If359b4ca625371fbdb68177c7cdb6498c3a519a1
Fixes: 28161335
2016-06-24 13:17:31 -07:00
Min Yun
7278cdf260
Reapply more strings for \\"more settings\\" am: de383c75eb
...
am: 0dfa15fd05
2016-06-24 20:17:12 +00:00
Min Yun
64582b497c
Reapply more strings for \\"more settings\\" am: de383c75eb
...
am: dd962fd1bd
2016-06-24 20:16:57 +00:00
Min Yun
0dfa15fd05
Reapply more strings for \"more settings\"
...
am: de383c75eb
2016-06-24 20:10:14 +00:00
Min Yun
dd962fd1bd
Reapply more strings for \"more settings\"
...
am: de383c75eb
2016-06-24 20:10:02 +00:00
Andrew Sapperstein
0ccd0fed27
Properly tint crash dialog.
...
Change-Id: I6a74b08acd5e13c750ce512e61518972cc55940b
FIXES: 29619712
2016-06-24 12:11:09 -07:00
Chong Zhang
53539ae535
Merge \"Do not load exit animation again if window is already animating\" into nyc-mr1-dev
...
am: 1156c52b03
2016-06-24 19:00:24 +00:00
Chong Zhang
1156c52b03
Merge "Do not load exit animation again if window is already animating" into nyc-mr1-dev
2016-06-24 18:51:14 +00:00
Andrew Sapperstein
9a2c4f867c
Merge \"Add DeviceDefault style used by ringtone picker.\" into nyc-mr1-dev
...
am: 411b9c69a1
2016-06-24 18:42:12 +00:00
Andrew Sapperstein
16f3293e1a
Merge \"Update QS battery trendline to use theme color.\" into nyc-mr1-dev
...
am: 3d29644f28
2016-06-24 18:35:48 +00:00
Andrew Sapperstein
411b9c69a1
Merge "Add DeviceDefault style used by ringtone picker." into nyc-mr1-dev
2016-06-24 18:31:43 +00:00
Chong Zhang
8c5d422e02
Do not load exit animation again if window is already animating
...
Transition can be started as soon as the entering app is drawn.
If the exiting app relayouts to invisible after transition started,
don't load the exit animation again.
bug: 29405575
Change-Id: I05ba4f733afb9426626db113be721a6bf888f093
2016-06-24 11:30:58 -07:00
Min Yun
de383c75eb
Reapply more strings for "more settings"
...
Fixes: 29620816
Change-Id: Iabfcb3b762e1d7d105d2b4c417fc0902d7e7ca16
2016-06-24 18:28:17 +00:00
Andrew Sapperstein
3d29644f28
Merge "Update QS battery trendline to use theme color." into nyc-mr1-dev
2016-06-24 18:19:32 +00:00
Doris Liu
b53c9c1658
Merge \"Fix NPE for checking for whether animators should play together\" into nyc-mr1-dev
...
am: 7f9c189f06
2016-06-24 17:53:06 +00:00
Doris Liu
7f9c189f06
Merge "Fix NPE for checking for whether animators should play together" into nyc-mr1-dev
2016-06-24 17:47:44 +00:00
Makoto Onuki
761e9193a3
Merge \"Make \"cmd package set-home-activity\" more CTS friendly\" into nyc-mr1-dev
...
am: 2a6f79d45f
2016-06-24 17:43:18 +00:00
Bill Yi
19fd74dd8d
Import translations. DO NOT MERGE am: 34f5924ca6 -s ours
...
am: 27465d7d0e
2016-06-24 17:38:17 +00:00
Makoto Onuki
2a6f79d45f
Merge "Make "cmd package set-home-activity" more CTS friendly" into nyc-mr1-dev
2016-06-24 17:37:07 +00:00
Bill Yi
79c0054e97
Import translations. DO NOT MERGE am: 34f5924ca6 -s ours
...
am: f7c19ca80f
2016-06-24 17:33:14 +00:00
Bill Yi
27465d7d0e
Import translations. DO NOT MERGE
...
am: 34f5924ca6
2016-06-24 17:28:18 +00:00
Bill Yi
f7c19ca80f
Import translations. DO NOT MERGE
...
am: 34f5924ca6
2016-06-24 17:23:28 +00:00
Yi Kong
f89aa7e756
Merge \\\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\\" am: f388075f8f am: a153a22f80
...
am: 48e5206081
2016-06-24 17:10:51 +00:00
Yi Kong
48e5206081
Merge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" am: f388075f8f
...
am: a153a22f80
2016-06-24 17:04:42 +00:00
Yi Kong
a5f5a0ec51
Merge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" into stage-aosp-master am: a725dbd6c7
...
am: 79f65e5d67
2016-06-24 17:01:06 +00:00
Yi Kong
a153a22f80
Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\"
...
am: f388075f8f
2016-06-24 16:55:48 +00:00
Yi Kong
79f65e5d67
Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master
...
am: a725dbd6c7
2016-06-24 16:55:38 +00:00
Yi Kong
a725dbd6c7
Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master
2016-06-24 16:47:31 +00:00
Yi Kong
f388075f8f
Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259"
2016-06-24 16:47:03 +00:00
Suprabh Shukla
5c451c08bc
Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
...
am: bb1fb395ca
2016-06-24 16:36:55 +00:00
Amith Yamasani
bb1fb395ca
Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev
2016-06-24 16:08:16 +00:00
Bill Yi
34f5924ca6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29578243
Change-Id: Ibfcaf1dcbb2cc51dcec359edb8525a2a56ab1231
2016-06-24 08:33:56 -07:00
Android Build Merger (Role)
ac77f46643
Merge "Always reapply strings. am: 9c0c3d8d8b am: 630cc3017a" into nyc-mr1-dev-plus-aosp
2016-06-24 15:22:24 +00:00
Julia Reynolds
91ea483a08
Always reapply strings. am: 9c0c3d8d8b
...
am: 630cc3017a
2016-06-24 15:21:53 +00:00
Julia Reynolds
ba145d73ab
Always reapply strings. am: 9c0c3d8d8b
...
am: 6a030524d8
2016-06-24 15:21:51 +00:00
Julia Reynolds
6a030524d8
Always reapply strings.
...
am: 9c0c3d8d8b
2016-06-24 15:16:36 +00:00
Julia Reynolds
630cc3017a
Always reapply strings.
...
am: 9c0c3d8d8b
2016-06-24 15:16:35 +00:00
Julia Reynolds
5aba92640a
Merge \"Show volume row headers by default.\" into nyc-mr1-dev
...
am: 459f594bb1
2016-06-24 15:03:02 +00:00
TreeHugger Robot
459f594bb1
Merge "Show volume row headers by default." into nyc-mr1-dev
2016-06-24 14:52:40 +00:00
Julia Reynolds
5f83c85182
Show volume row headers by default.
...
Bug: 28269951
Change-Id: I26acfb26064e7f44e4b1897d940228247b45d7b1
2016-06-24 09:17:55 -04:00
Julia Reynolds
9c0c3d8d8b
Always reapply strings.
...
Change-Id: Icc66d1e23048d2676b5776c3eec76345963228d0
Fixes: 29620816
2016-06-24 12:49:29 +00:00
Przemyslaw Szczepaniak
9dcaf12623
Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06
...
am: 3606de0fb4
2016-06-24 11:58:07 +00:00
Przemyslaw Szczepaniak
3606de0fb4
Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
...
am: ab3d167f06
2016-06-24 11:53:57 +00:00
Przemyslaw Szczepaniak
89d16125be
Merge \\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\" am: 36ce097dbb am: 12bb15c1d3
...
am: 387191bc64
2016-06-24 11:38:01 +00:00
Przemyslaw Szczepaniak
387191bc64
Merge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: 36ce097dbb
...
am: 12bb15c1d3
2016-06-24 11:33:42 +00:00
