Bill Yi
d6498d1120
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 16:09:13 +00:00
Bill Yi
7a81bcd670
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30233028
Change-Id: If78d06c444ccd169c81a1ec4e5d8af86c846ced9
2016-07-21 09:07:41 -07:00
Srinath Sridharan
6c92c0eb5c
Merge "Adding a new getThreadScheduler() method." into nyc-mr1-dev
2016-07-21 16:00:40 +00:00
Benjamin Franz
0eadbe6d36
Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3 -s ours
...
am: 662e2a7975
2016-07-21 15:39:52 +00:00
Billy Lamberta
199e855f9f
Merge \"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919\" into nyc-dev
...
am: 7dbcfcadd5
2016-07-21 15:39:50 +00:00
Billy Lamberta
cb3ae89fbd
docs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f
...
am: c7cffa3e6a
2016-07-21 15:39:48 +00:00
Amanda Kassay
576bda4222
Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am: 83fb75ded3
...
am: e9d58227bb
2016-07-21 15:39:45 +00:00
Benjamin Franz
662e2a7975
Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9
...
am: cb805b35f3
2016-07-21 15:27:28 +00:00
Android Build Merger (Role)
7dbcfcadd5
Merge "docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919" into nyc-dev
2016-07-21 15:22:32 +00:00
Mark Lu
081b4b3265
Merge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
...
am: a7ce29962c
2016-07-21 15:22:27 +00:00
Billy Lamberta
c5ec6c443d
docs: work - Managed configuration bundles am: ef57498142
...
am: ba633fc919
2016-07-21 15:21:58 +00:00
Billy Lamberta
c7cffa3e6a
docs: work - Managed configuration bundles am: ef57498142
...
am: 9684f2cd2f
2016-07-21 15:21:52 +00:00
Amanda Kassay
e9d58227bb
Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
...
am: 83fb75ded3
2016-07-21 15:21:50 +00:00
Erik Kline
6599ee8b96
Support removing specific routes from local_network
...
Bug: 9580643
Change-Id: Id0aaf4bc7424797e2beef03fb18a2c1885a86509
2016-07-21 22:23:50 +09:00
Benjamin Franz
cb805b35f3
Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093
...
am: 87534f4ac9
2016-07-21 10:14:59 +00:00
Benjamin Franz
87534f4ac9
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3
...
am: 7abd7ba093
2016-07-21 10:10:03 +00:00
Benjamin Franz
7abd7ba093
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
...
am: 3e582390b3
2016-07-21 10:05:33 +00:00
Benjamin Franz
3e582390b3
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
2016-07-21 09:59:42 +00:00
TreeHugger Robot
e3f28911af
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 04:14:06 +00:00
Thierry Strudel
1a48150980
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
...
* changes:
Settings: add logpersist kernel only selection (strings)
Settings: add logpersist selection (strings)
2016-07-21 04:07:24 +00:00
TreeHugger Robot
c3264b01ed
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 04:02:07 +00:00
TreeHugger Robot
28cb163056
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:33:20 +00:00
TreeHugger Robot
50fd9a9ca4
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:33:11 +00:00
TreeHugger Robot
3638c9b330
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:32:51 +00:00
TreeHugger Robot
dfb24a204f
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:32:43 +00:00
TreeHugger Robot
09af2a1032
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:32:21 +00:00
TreeHugger Robot
c1079364cb
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:32:01 +00:00
TreeHugger Robot
60858a45cd
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:31:52 +00:00
TreeHugger Robot
db89342ec6
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:31:32 +00:00
TreeHugger Robot
a9a03b5d7e
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:31:24 +00:00
TreeHugger Robot
98e71028c7
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 03:31:02 +00:00
Bill Yi
8eff1c381b
Import translations. DO NOT MERGE
...
Change-Id: I7261aecb1f28f1b46c1555c52a0010bcc6c52408
Auto-generated-cl: translation import
2016-07-20 19:44:42 -07:00
Bill Yi
01e04d9724
Import translations. DO NOT MERGE
...
Change-Id: If251730b4f9eb5fb6f9e0ce7fd2e675adb73862e
Auto-generated-cl: translation import
2016-07-20 19:38:44 -07:00
Matthew Fritze
9e7bd8de87
Merge "Revert "Revert "Error colors to point to frameworks rather than hard-code them""" into nyc-mr1-dev
2016-07-21 01:04:25 +00:00
Matthew Fritze
0cb33aefac
Revert "Revert "Error colors to point to frameworks rather than hard-code them""
...
This reverts commit 7c11e933d5
2016-07-21 00:59:33 +00:00
Andrew Sapperstein
22d09743d8
Merge "Revert "Error colors to point to frameworks rather than hard-code them"" into nyc-mr1-dev
2016-07-21 00:57:02 +00:00
Matthew Fritze
7c11e933d5
Revert "Error colors to point to frameworks rather than hard-code them"
...
This reverts commit 43f762a026
2016-07-21 00:55:53 +00:00
Chris Craik
433a19e8bf
Merge "Change swap chain stuffed detection logic" into nyc-mr1-dev
2016-07-21 00:26:15 +00:00
Amith Yamasani
8c8d752851
Merge "Allow calling in demo mode" into nyc-mr1-dev
2016-07-21 00:21:13 +00:00
Chris Craik
3163568806
Change swap chain stuffed detection logic
...
bug:29771461
bug:29413700
bug:30181577
Changes frame interval gap detection to look for wider gaps, as they
were incorrectly firing all the time.
Also adds a 500ms minimum gap between frames dropped because of stuffed
swap chain, to prevent dropping too often.
Change-Id: If16ed637d54bf37015704be102c5c2e3731a0824
2016-07-20 16:47:03 -07:00
Matthew Fritze
948400a43d
Merge "Error colors to point to frameworks rather than hard-code them" into nyc-mr1-dev
2016-07-20 23:34:41 +00:00
TreeHugger Robot
01acf40e0f
Merge "Direct Reply: Allow closing IME separately from DirectReply mode" into nyc-mr1-dev
2016-07-20 23:29:22 +00:00
Doris Liu
ffa880b83f
Merge "Fix VD animator not being properly resumed" into nyc-mr1-dev
2016-07-20 23:10:53 +00:00
Michael Kwan
70a789f569
Merge "Fix crash on devices with 1.2" screens." into nyc-mr1-dev
2016-07-20 23:08:05 +00:00
Makoto Onuki
b84ce2e034
Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev
2016-07-20 23:05:31 +00:00
TreeHugger Robot
d661476c98
Merge "SoundTriggerHelpoer: Send pause events on abort if a model is running." into nyc-mr1-dev
2016-07-20 23:05:21 +00:00
Chris Tate
bf9fa8280e
Merge "Run the SELinux wallpaper restorecon operations on all users" into nyc-mr1-dev
2016-07-20 22:45:12 +00:00
Bill Yi
6e231e5d17
Import translations. DO NOT MERGE
...
Change-Id: Ibefe0963160a02bc49c36a2511d5c3f72f8078c2
Auto-generated-cl: translation import
2016-07-20 15:23:45 -07:00
Bill Yi
edff57413e
Import translations. DO NOT MERGE
...
Change-Id: Id8b102a4e41d6b25a88ae261313fc46f2781451e
Auto-generated-cl: translation import
2016-07-20 15:18:26 -07:00
Billy Lamberta
9684f2cd2f
docs: work - Managed configuration bundles
...
am: ef57498142
2016-07-20 22:15:57 +00:00
