Commit Graph

176611 Commits

Author SHA1 Message Date
Alan Viverette
643b4aa61d am 02cd927d: am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '02cd927dffa24479a0ca29b40ead7b28f9e60a7c':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
2014-12-01 20:07:27 +00:00
Geoff Mendal
825d5c46dd am 8dd80c52: (-s ours) am 533371c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '8dd80c52b09f64a11752941a4d9a30c7e520a9da':
  Import translations. DO NOT MERGE
2014-12-01 20:07:23 +00:00
Jeff Sharkey
2a3ca185bf am 45207128: am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
* commit '45207128c5c4f0d1f106af8561bdd156546b0aad':
  Sanitize display names, keep extensions intact.
2014-12-01 20:07:19 +00:00
Jeff Sharkey
7f9eeaf4c1 am 2f8f394b: resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp
* commit '2f8f394b14ab0ed6b65ce440a2ddc8aa09fbb8fa':
  APK still has privileged flag after being moved from "/system/priv-app"
2014-12-01 20:07:14 +00:00
Geoff Mendal
9259ad7282 am f93c82ae: (-s ours) am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'f93c82ae366970b3c06dedf2b040d000c16d2261':
  Import translations. DO NOT MERGE
2014-12-01 20:01:21 +00:00
Joe Fernandez
00ba894b49 am 2cbfc845: am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update
* commit '2cbfc8455d51cb89cdd161f5e46d1f56023c903b':
  docs: December 2014 Dashboard update
2014-12-01 20:01:15 +00:00
smain@google.com
230df25726 am e979e259: am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image
* commit 'e979e259d22279cd35f9ebcc7b42efbae1b77ce1':
  change Trulia context image
2014-12-01 20:01:10 +00:00
Jeremy Joslin
b81134f211 am 33783a96: am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit '33783a962f3336400d12cd739ae33b9452ea14be':
  Fix the ordering of extra values in the PI.
2014-12-01 20:01:02 +00:00
Alan Viverette
02cd927dff am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '53644fb5acd394b875723b6483215ba837f8e6c0':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
2014-12-01 20:00:49 +00:00
Geoff Mendal
8dd80c52b0 am 533371c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '533371c5924cc467ec8dc31cd577390a37898c8d':
  Import translations. DO NOT MERGE
2014-12-01 20:00:39 +00:00
Jeff Sharkey
45207128c5 am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
* commit '05d455ca2b83793a81aac2544c388eec8ac140cd':
  Sanitize display names, keep extensions intact.
2014-12-01 20:00:32 +00:00
Jeff Sharkey
2f8f394b14 resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp
Change-Id: I714b443d66feb7d7416152254d21cac87a6fa451
2014-12-01 11:57:09 -08:00
Jason Monk
b06a35716d am 0f514474: am c0c34b42: am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
* commit '0f514474b2c21c17210cec7c812a1c80dd55da19':
  SysUI: QS Wifi get connected wifi rssi from NC
2014-12-01 19:54:59 +00:00
Amith Yamasani
bd815f90ca am e434a949: am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
* commit 'e434a94936c8f48bd5158849a09c1e6ce8d6e2d1':
  Fix parsing bug that affects reading back guest restrictions
2014-12-01 19:54:55 +00:00
Geoff Mendal
23dd8ef105 am 2a36f7e3: (-s ours) am e7f81f3b: (-s ours) am 6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '2a36f7e3ab87db68ed0a66f25bc79ebe05139891':
  Import translations. DO NOT MERGE
2014-12-01 19:54:51 +00:00
John Spurlock
aac7a9f4c7 am 34c9ee1a: am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
* commit '34c9ee1af8980594df096e7759c50277270e658c':
  Volume: Improve inline volume controls used in settings.
2014-12-01 19:54:45 +00:00
Ihab Awad
6d605377e5 am 984f3c4d: am 8199d6c3: am 6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev
* commit '984f3c4df8e5faad5b0ef30649f9ea1f3bc0dc65':
  Telecom API updates (1/6)
2014-12-01 19:54:40 +00:00
Chet Haase
0d52d01ece am fd942b50: am 8394e9ff: am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
* commit 'fd942b50f120a4530906268ab68ae2ddd4efde01':
  Zero duration animations snap to end value when started
2014-12-01 19:54:35 +00:00
Geoff Mendal
aa9f2e3729 am 31457ead: (-s ours) am 9e863741: (-s ours) am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '31457ead0fd81b8c83da68873c7c0608d43aac7d':
  Import translations. DO NOT MERGE
2014-12-01 19:54:31 +00:00
Geoff Mendal
5a05252062 am 835e7191: (-s ours) am 11fe2dfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '835e71910129eb376d40c7bc92ea858b3b76a168':
  Import translations. DO NOT MERGE
2014-12-01 19:54:27 +00:00
John Spurlock
fc6020c8a9 am f1832e24: am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
* commit 'f1832e2444d746dae25e64e4f91bd1dc6d2329ce':
  Zen: Improve zen mode panel condition selection.
2014-12-01 19:54:22 +00:00
John Spurlock
d101a6e903 am 53da315f: am c1e4d155: am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
* commit '53da315f1d27885a94fc5435e2593ce7d48f29a9':
  Doze: Break out proxcheck stats by pulse reason.
2014-12-01 19:54:18 +00:00
John Spurlock
501dd8f4bd am edd0d0ea: am fdc07dce: am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev
* commit 'edd0d0ea98ec1ab662c13db83045191c10235d08':
  Volume: Update remote volume icons.
2014-12-01 19:54:13 +00:00
Geoff Mendal
59030e32e0 am fe021d5e: (-s ours) am 68137588: (-s ours) am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE
* commit 'fe021d5ee6af15078a5cfdca2c4ad188fa001d70':
  Import translations. DO NOT MERGE
2014-12-01 19:54:08 +00:00
Geoff Mendal
8d7b73f042 am fceec9ca: (-s ours) am a990faec: (-s ours) Import translations. DO NOT MERGE
* commit 'fceec9cad4a7ef69f1960f2c6a0eae56227e828a':
  Import translations. DO NOT MERGE
2014-12-01 19:54:04 +00:00
Wally Yau
7d64195e50 am 4b187a28: am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '4b187a28106257638cac25360b8bb59cbf497582':
  Set stream volume to max when userMasterVolume is set to true.
2014-12-01 19:53:55 +00:00
Elliott Hughes
24946d8143 am 421f826a: am 7ff0b469: am 07b4a291: am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation.
* commit '421f826a09cf1c278e5b22e2e82ceaf3802992f7':
  Mention ProGuard in the JNI documentation.
2014-12-01 19:53:51 +00:00
Geoff Mendal
f93c82ae36 am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'f90404ca7b47234437b3f8f418fca313825de02c':
  Import translations. DO NOT MERGE
2014-12-01 19:50:17 +00:00
Joe Fernandez
2cbfc8455d am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update
* commit '353da3f98d86eb750b756335892c768f76cc4616':
  docs: December 2014 Dashboard update
2014-12-01 19:50:12 +00:00
smain@google.com
e979e259d2 am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image
* commit '77e889ed84ea0f626a9164fad50299d131a1cac1':
  change Trulia context image
2014-12-01 19:50:07 +00:00
Shishir Agrawal
0201a6f6f1 TelephonyManager.setLine1NumberForDisplay should return a boolean.
The call can fail and should return the success status of the call.

Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
2014-12-01 11:48:53 -08:00
Jason Monk
0f514474b2 am c0c34b42: am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
* commit 'c0c34b428f6d3de635bc832bbebdb7b9cb500ccd':
  SysUI: QS Wifi get connected wifi rssi from NC
2014-12-01 19:48:42 +00:00
Amith Yamasani
e434a94936 am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
* commit '0c81034cac4efe7d538ff303cc9f2badbb22b8d8':
  Fix parsing bug that affects reading back guest restrictions
2014-12-01 19:48:36 +00:00
Geoff Mendal
2a36f7e3ab am e7f81f3b: (-s ours) am 6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'e7f81f3b684bde04432889943c5085ed1d2b9b1b':
  Import translations. DO NOT MERGE
2014-12-01 19:48:20 +00:00
John Spurlock
34c9ee1af8 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
* commit '23a99a3ab09d90e3613b44a0962de7ed0028d620':
  Volume: Improve inline volume controls used in settings.
2014-12-01 19:47:58 +00:00
Ihab Awad
984f3c4df8 am 8199d6c3: am 6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev
* commit '8199d6c3db16d786f15f1d643afe599dcfa6cf1e':
  Telecom API updates (1/6)
2014-12-01 19:47:23 +00:00
Chet Haase
fd942b50f1 am 8394e9ff: am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
* commit '8394e9fff32c8935e021f0e4e84c5c1de913b96f':
  Zero duration animations snap to end value when started
2014-12-01 19:47:15 +00:00
Geoff Mendal
31457ead0f am 9e863741: (-s ours) am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '9e8637411a2a637e5795ff721ea6a92141cf76ec':
  Import translations. DO NOT MERGE
2014-12-01 19:47:03 +00:00
Geoff Mendal
835e719101 am 11fe2dfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '11fe2dfd3267c86c598dd443aaf471e8d490b4bb':
  Import translations. DO NOT MERGE
2014-12-01 19:46:57 +00:00
John Spurlock
f1832e2444 am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
* commit '64e034e351ad73b9cb99cb04511d0fea137c7a3b':
  Zen: Improve zen mode panel condition selection.
2014-12-01 19:46:50 +00:00
John Spurlock
53da315f1d am c1e4d155: am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
* commit 'c1e4d1554f23db7f0de91a212d94a1b624dec64d':
  Doze: Break out proxcheck stats by pulse reason.
2014-12-01 19:46:44 +00:00
John Spurlock
edd0d0ea98 am fdc07dce: am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev
* commit 'fdc07dce372e94b274b725ba571c2ad4979565da':
  Volume: Update remote volume icons.
2014-12-01 19:46:38 +00:00
Geoff Mendal
fe021d5ee6 am 68137588: (-s ours) am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE
* commit '68137588d1a1924703a2b995b15293515c4ff418':
  Import translations. DO NOT MERGE
2014-12-01 19:46:31 +00:00
Geoff Mendal
fceec9cad4 am a990faec: (-s ours) Import translations. DO NOT MERGE
* commit 'a990faec871f4ca369e17c7bd36488747e890bc9':
  Import translations. DO NOT MERGE
2014-12-01 19:46:24 +00:00
Wally Yau
4b187a2810 am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '5b4e2e02744c676f2d282388c0d901494fe8a5b9':
  Set stream volume to max when userMasterVolume is set to true.
2014-12-01 19:46:11 +00:00
Elliott Hughes
421f826a09 am 7ff0b469: am 07b4a291: am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation.
* commit '7ff0b469950c225ab3a8a245b6c5ff49ba38497e':
  Mention ProGuard in the JNI documentation.
2014-12-01 19:45:32 +00:00
Geoff Mendal
f90404ca7b am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'ff26f10fab3e79d535001b8e1c9155d7844375c4':
  Import translations. DO NOT MERGE
2014-12-01 19:44:10 +00:00
Joe Fernandez
353da3f98d am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update
* commit '88e04fcbc679ae85043d5db4f7f17bbb7fc3f2d3':
  docs: December 2014 Dashboard update
2014-12-01 19:44:04 +00:00
smain@google.com
77e889ed84 am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image
* commit '446bab79564e50c497e6ce5cf75a30ddd94855fe':
  change Trulia context image
2014-12-01 19:43:58 +00:00
Jeremy Joslin
33783a962f am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit '500f781110dee5aad53410e9ef9b4003123c6981':
  Fix the ordering of extra values in the PI.
2014-12-01 19:42:24 +00:00