Martijn Coenen
d5dcb6d4e9
am 1b3a4362: am f77445cd: am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
...
* commit '1b3a4362a08d816d78fdbb04ef115b31c8674420':
Allow the NFC process to call Bluetooth APIs.
2012-11-30 11:14:05 -08:00
Martijn Coenen
1b3a4362a0
am f77445cd: am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
...
* commit 'f77445cd48f9174647c4c7ff539036b5aa08ce6e':
Allow the NFC process to call Bluetooth APIs.
2012-11-30 11:11:44 -08:00
Martijn Coenen
f77445cd48
am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
...
* commit 'b1a01ab01c2aa5136f7781c3a6ec682590e38ac4':
Allow the NFC process to call Bluetooth APIs.
2012-11-30 11:09:43 -08:00
Martijn Coenen
b1a01ab01c
Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
2012-11-30 11:08:07 -08:00
Dianne Hackborn
0f6f210264
am 7b1af760: am 1bd7d5e4: am 675814d4: Merge "Maybe fix issue #7596986 : Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
...
* commit '7b1af76074423837d26ccb4e3b4c1b5d25baa25e':
Maybe fix issue #7596986 : Frequent runtime restarts; IAE at...
2012-11-30 10:49:08 -08:00
Dianne Hackborn
7b1af76074
am 1bd7d5e4: am 675814d4: Merge "Maybe fix issue #7596986 : Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
...
* commit '1bd7d5e47ed7e73c244b79c5a92d6af1e3e89266':
Maybe fix issue #7596986 : Frequent runtime restarts; IAE at...
2012-11-30 10:47:01 -08:00
Dianne Hackborn
1bd7d5e47e
am 675814d4: Merge "Maybe fix issue #7596986 : Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
...
* commit '675814d488579582e0214cc720d9ccc310173f25':
Maybe fix issue #7596986 : Frequent runtime restarts; IAE at...
2012-11-30 10:45:02 -08:00
Nick Kralevich
701e73d3f6
am 4816f4b4: am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '4816f4b4088ce35b2cddf1034ae483e30b7ed22c':
Secure a handful of framework broadcasts
2012-11-30 10:43:24 -08:00
Dianne Hackborn
675814d488
Merge "Maybe fix issue #7596986 : Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
2012-11-30 10:42:15 -08:00
Nick Kralevich
4816f4b408
am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '0def7b94960ae551c498212d97c7919da7529429':
Secure a handful of framework broadcasts
2012-11-30 10:40:18 -08:00
Nick Kralevich
0def7b9496
am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '849f5188e34ea667b689e795d88411a2412db2e8':
Secure a handful of framework broadcasts
2012-11-30 10:38:21 -08:00
Nick Kralevich
849f5188e3
am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
Secure a handful of framework broadcasts
2012-11-30 10:35:44 -08:00
Nick Kralevich
6643ea823b
resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
2012-11-30 10:23:56 -08:00
Daniel Sandler
a2eb969726
am 590e0e5b: am 5dde83c4: am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
...
* commit '590e0e5b8dbc1f9d9bef69d675b158d6a36ac073':
Suppress quick settings if setup has not been completed.
2012-11-30 10:14:29 -08:00
Scott Main
880635023c
am 63c84b75: am 0988f445: am 73117424: am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
...
* commit '63c84b75e41b62cab9c87991810bd49e49bd50cd':
docs: gms and gcm javadocs
2012-11-30 10:12:51 -08:00
Marco Nelissen
0c779aa1fb
am 7f05beb1: am 334a36b3: Merge "Change the text color of timer in MediaController"
...
* commit '7f05beb125a0270fee58a96b533baf97536d8b7e':
Change the text color of timer in MediaController
2012-11-30 10:12:47 -08:00
Scott Main
63b29c38cc
am aa9cc316: am f239a76c: am 3cddba24: am b74844cd: docs: revise doc titles
...
* commit 'aa9cc3163e9264033d7e848b73067c09021e23b0':
docs: revise doc titles
2012-11-30 10:12:44 -08:00
Daniel Sandler
590e0e5b8d
am 5dde83c4: am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
...
* commit '5dde83c4d1e9b3c39f0dbba07421a7dcf678a4cf':
Suppress quick settings if setup has not been completed.
2012-11-30 10:09:16 -08:00
Daniel Sandler
5dde83c4d1
am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
...
* commit '0a6620e8615ade341336730a5aa9f0e62a295c9f':
Suppress quick settings if setup has not been completed.
2012-11-30 10:07:01 -08:00
Robert Greenwalt
011132a7d3
am b8da0376: Secure a handful of framework broadcasts
...
* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
Secure a handful of framework broadcasts
2012-11-30 10:05:33 -08:00
Makoto Onuki
aeb3751559
resolved conflicts for merge of 9cd8c711 to master
...
Change-Id: I5e2d13c44f6a0589648e5934c8c36790da85e828
2012-11-30 10:05:20 -08:00
Daniel Sandler
0a6620e861
Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
2012-11-30 10:05:01 -08:00
Scott Main
63c84b75e4
am 0988f445: am 73117424: am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
...
* commit '0988f445a1b802f56ff7576d34e06cce7538701a':
docs: gms and gcm javadocs
2012-11-30 10:03:29 -08:00
Scott Main
0988f445a1
am 73117424: am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
...
* commit '73117424029ce1983f2f0a2f706d08e1f5870955':
docs: gms and gcm javadocs
2012-11-30 10:01:19 -08:00
Scott Main
7311742402
am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
...
* commit '580aa579080b5f4ccddb31964bc0caa76ee73a7a':
docs: gms and gcm javadocs
2012-11-30 09:59:42 -08:00
Scott Main
580aa57908
Merge "docs: gms and gcm javadocs" into jb-mr1-dev
2012-11-30 09:56:48 -08:00
Marco Nelissen
7f05beb125
am 334a36b3: Merge "Change the text color of timer in MediaController"
...
* commit '334a36b32c96d26f3aedcca81ab475391414dc80':
Change the text color of timer in MediaController
2012-11-30 09:55:34 -08:00
Scott Main
aa9cc3163e
am f239a76c: am 3cddba24: am b74844cd: docs: revise doc titles
...
* commit 'f239a76c156e386d5464dac49a1718a91c9c24d4':
docs: revise doc titles
2012-11-30 09:54:28 -08:00
Scott Main
f239a76c15
am 3cddba24: am b74844cd: docs: revise doc titles
...
* commit '3cddba247e4f9c188cc654a0c3df9db693874199':
docs: revise doc titles
2012-11-30 09:52:22 -08:00
Scott Main
3cddba247e
am b74844cd: docs: revise doc titles
...
* commit 'b74844cd87160a21a77cdc1c35b3d19ce9f47249':
docs: revise doc titles
2012-11-30 09:49:51 -08:00
Scott Main
b74844cd87
docs: revise doc titles
...
Change-Id: I7a11aabd90df758a5118730fe2d1b6c4f4e6ecfd
2012-11-30 09:46:26 -08:00
Irfan Sheriff
38ddedc8ad
Merge "Support for dumping transition only messages"
2012-11-30 09:41:51 -08:00
Makoto Onuki
9cd8c711a7
am 95229721: am c50ed032: Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
...
* commit '9522972108ac5ff009eef2a124cfc72e692d54b9':
Remove unused IExtendedNetworkService
2012-11-30 09:38:21 -08:00
Makoto Onuki
9522972108
am c50ed032: Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
...
* commit 'c50ed032c71069893d9ad0bb81ee8013fdd44d66':
Remove unused IExtendedNetworkService
2012-11-30 09:36:11 -08:00
Makoto Onuki
c50ed032c7
Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
2012-11-30 09:33:11 -08:00
Eric Laurent
b686eceac9
am b46857d2: am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
...
* commit 'b46857d228edc53878e738ffd484dea1acf44baf':
AudioService: improve initial safe volume delay
2012-11-30 09:33:01 -08:00
Eric Laurent
b46857d228
am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
...
* commit 'b1f45c4a587e5adda39774a867c78b56682c5f0d':
AudioService: improve initial safe volume delay
2012-11-30 09:31:03 -08:00
Eric Laurent
b1f45c4a58
am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
...
* commit 'c3eb57b22f930f07448e877f0814eb5659bfc3c5':
AudioService: improve initial safe volume delay
2012-11-30 09:28:56 -08:00
Eric Laurent
c3eb57b22f
Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
2012-11-30 09:26:30 -08:00
Marco Nelissen
334a36b32c
Merge "Change the text color of timer in MediaController"
2012-11-30 09:03:10 -08:00
Roger Chen
56dc91f7ce
Change the text color of timer in MediaController
...
The color of timer and backgroud in MediaController
are too closer to distinguish.
Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2012-11-30 08:58:43 -08:00
Irfan Sheriff
ef8da9fe0b
Support for dumping transition only messages
...
Change-Id: I4968e28334f9dd49bd8fb81d04b25d62ca6da300
2012-11-30 08:13:27 -08:00
Daniel Sandler
9e3efb9155
am d1b73fc1: am 71988c81: am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
...
* commit 'd1b73fc17ca222cc627c932625efe9c3c1ad3b0c':
Only show "charging" if the battery is really charging.
2012-11-30 07:34:53 -08:00
Daniel Sandler
d1b73fc17c
am 71988c81: am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
...
* commit '71988c81a3ae9d372c1eb2991f509a8c5c83f08c':
Only show "charging" if the battery is really charging.
2012-11-30 07:32:24 -08:00
Daniel Sandler
71988c81a3
am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
...
* commit '386165a3ae09b150165e8e7c310e194231071271':
Only show "charging" if the battery is really charging.
2012-11-30 07:29:46 -08:00
Daniel Sandler
386165a3ae
Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
2012-11-30 07:27:36 -08:00
Robert Ly
3c4b4f7c31
docs: gms and gcm javadocs
...
Change-Id: I93fe06983e42cb21d05d020e84cafe31792a9c8e
2012-11-30 04:02:04 -08:00
Dirk Dougherty
3ce74b24d8
am fa459613: am 6875b438: am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
...
* commit 'fa4596131d818667e26ffbdba6f351f6c1073ee9':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
2012-11-29 21:21:34 -08:00
Dirk Dougherty
fa4596131d
am 6875b438: am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
...
* commit '6875b4385c1d1e4c1160ba6cd9128a461565338b':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
2012-11-29 21:20:00 -08:00
Dirk Dougherty
6875b4385c
am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
...
* commit 'a4f67a88f421c454cb07a59e9ce5b0b720df55fc':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
2012-11-29 21:17:03 -08:00
