Scott Main
c9a1bdf5a0
am a9c3d81f: am ae5b07ca: am 2db56dda: Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
...
* commit 'a9c3d81f02931e220ca0caca99647ca3b4b029ae':
docs: udpate for google service landing page and capitalize GPS in titles
2012-12-03 13:09:14 -08:00
Scott Main
a9c3d81f02
am ae5b07ca: am 2db56dda: Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
...
* commit 'ae5b07cac9d395d0454152d0f8141d162753d6a4':
docs: udpate for google service landing page and capitalize GPS in titles
2012-12-03 13:07:14 -08:00
Scott Main
d586872696
am 3fea139d: am 4d1d0304: am e38980a7: Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
...
* commit '3fea139d07f1fb8959bfc0b479844d9e90fed0b4':
docs: update dashboard for 12/1, plus misc fixes
2012-12-03 13:06:29 -08:00
Scott Main
ae5b07cac9
am 2db56dda: Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
...
* commit '2db56ddaee71f33f65fe246309531a66bf1d4374':
docs: udpate for google service landing page and capitalize GPS in titles
2012-12-03 13:04:53 -08:00
Scott Main
3fea139d07
am 4d1d0304: am e38980a7: Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
...
* commit '4d1d03042110092d658b7b53565be881364b34b5':
docs: update dashboard for 12/1, plus misc fixes
2012-12-03 13:04:31 -08:00
Robert Ly
b3aa49c6bd
am 0fba90c9: am 413a208a: am 555c93b2: docs: refresh gms and gcm javadocs
...
* commit '0fba90c980b96e43081350e4f87f57106b235dca':
docs: refresh gms and gcm javadocs
2012-12-03 13:03:44 -08:00
Scott Main
4d1d030421
am e38980a7: Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
...
* commit 'e38980a767ae8e13214f8ed00629ebb454157d46':
docs: update dashboard for 12/1, plus misc fixes
2012-12-03 13:02:07 -08:00
Scott Main
2db56ddaee
Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
2012-12-03 13:01:19 -08:00
Robert Ly
0fba90c980
am 413a208a: am 555c93b2: docs: refresh gms and gcm javadocs
...
* commit '413a208a7b1dcba4679573ca85a22a466b790de5':
docs: refresh gms and gcm javadocs
2012-12-03 13:00:48 -08:00
Scott Main
03c172e222
docs: udpate for google service landing page and capitalize GPS in titles
...
Change-Id: I8cff9c5bc6eee7a60bc5db88763ad57eb63c7e7d
2012-12-03 13:00:09 -08:00
Robert Ly
413a208a7b
am 555c93b2: docs: refresh gms and gcm javadocs
...
* commit '555c93b2a726d53c70e99835d74d9246dff2206d':
docs: refresh gms and gcm javadocs
2012-12-03 12:59:27 -08:00
Scott Main
e38980a767
Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
2012-12-03 12:58:59 -08:00
Irfan Sheriff
9648a484e0
am cdd03f54: Merge "Try go-negotiation when invocation request is deferred."
...
* commit 'cdd03f5487d3d0a088651c90fc5122b5fc3f62b3':
Try go-negotiation when invocation request is deferred.
2012-12-03 12:39:00 -08:00
Robert Ly
555c93b2a7
docs: refresh gms and gcm javadocs
...
Change-Id: I5532eb9f87e2ab87488884e70102e8b4cbadf255
2012-12-03 12:34:42 -08:00
Irfan Sheriff
cdd03f5487
Merge "Try go-negotiation when invocation request is deferred."
2012-12-03 11:59:53 -08:00
Zhihai Xu
e398d2323d
am fb9947ad: am 40973c53: Merge "BT is still on after enable flight mode, and reboot the DUT" into jb-mr1.1-dev
...
* commit 'fb9947ad77e9d1d2ea259d7fbc170c275810b2b9':
BT is still on after enable flight mode, and reboot the DUT
2012-12-03 11:52:43 -08:00
Zhihai Xu
fb9947ad77
am 40973c53: Merge "BT is still on after enable flight mode, and reboot the DUT" into jb-mr1.1-dev
...
* commit '40973c53acc86b576081fb720d7d6b23c55202ad':
BT is still on after enable flight mode, and reboot the DUT
2012-12-03 11:50:25 -08:00
The Android Open Source Project
da13b894ec
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I60d1dd7a490e86c1194da929483347f99b9f421d
2012-12-03 11:47:35 -08:00
Zhihai Xu
40973c53ac
Merge "BT is still on after enable flight mode, and reboot the DUT" into jb-mr1.1-dev
2012-12-03 11:47:34 -08:00
Jeff Sharkey
ae6428d707
am 1f8f2839: am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev
...
* commit '1f8f283975c7cf51081acd3ea494de2b5f431607':
Avoid null mobile interfaces.
2012-12-03 11:40:23 -08:00
Jeff Sharkey
1f8f283975
am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev
...
* commit 'ed3fba653864101d3dd335941f082104aad8f532':
Avoid null mobile interfaces.
2012-12-03 11:38:31 -08:00
Zhihai Xu
401202b5fe
BT is still on after enable flight mode, and reboot the DUT
...
bug 7275625
Change-Id: I4f8952a06152eb5f5775c1f616f6383e4f20e352
2012-12-03 11:36:21 -08:00
Jeff Sharkey
ed3fba6538
Merge "Avoid null mobile interfaces." into jb-mr1.1-dev
2012-12-03 11:32:51 -08:00
Adam Powell
e4db4e2b9d
am 05c8f17f: Merge "resolver list is not cleared on rebuild"
...
* commit '05c8f17f05ca83573f7670191e6dec91497dc742':
resolver list is not cleared on rebuild
2012-12-03 11:32:39 -08:00
Matthew Xie
3b5c43825e
am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev
...
* commit 'b8e80eb566aa5afb744db84a0067e144de831f45':
Clean up debug messages
2012-12-03 11:29:21 -08:00
Scott Main
aaaa15653b
docs: update dashboard for 12/1, plus misc fixes
...
Change-Id: I7f06b6c66476aee2bd69b8017b5707c483b252b7
2012-12-03 11:28:23 -08:00
Matthew Xie
b8e80eb566
am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev
...
* commit '4fd38e8d13697cd1b169487719982f32cc5fb425':
Clean up debug messages
2012-12-03 11:26:38 -08:00
Matthew Xie
4fd38e8d13
Merge "Clean up debug messages" into jb-mr1.1-dev
2012-12-03 11:23:57 -08:00
Guang Zhu
5732aaf1bb
am 8732bee8: am fdc0d929: Merge "app launch test fixes and improvements" into jb-mr1.1-dev
...
* commit '8732bee8d1e2ffc7a163769904bd799ac2730b4e':
app launch test fixes and improvements
2012-12-03 11:22:29 -08:00
Guang Zhu
8732bee8d1
am fdc0d929: Merge "app launch test fixes and improvements" into jb-mr1.1-dev
...
* commit 'fdc0d9295fbe855b14e1730447b079191f2a4f8c':
app launch test fixes and improvements
2012-12-03 11:19:50 -08:00
Guang Zhu
fdc0d9295f
Merge "app launch test fixes and improvements" into jb-mr1.1-dev
2012-12-03 11:17:25 -08:00
Adam Powell
05c8f17f05
Merge "resolver list is not cleared on rebuild"
2012-12-03 11:04:21 -08:00
Daniel Sandler
f80e1711ea
am 99931d97: am f8748809: Merge "Show alarm tile for the current user." into jb-mr1.1-dev
...
* commit '99931d97f7da8460e5d3696069bbb2cbda6b0d2a':
Show alarm tile for the current user.
2012-12-03 10:26:18 -08:00
Daniel Sandler
99931d97f7
am f8748809: Merge "Show alarm tile for the current user." into jb-mr1.1-dev
...
* commit 'f87488095e49028eb3be5a8a53a372e38eba537c':
Show alarm tile for the current user.
2012-12-03 10:23:08 -08:00
Daniel Sandler
f87488095e
Merge "Show alarm tile for the current user." into jb-mr1.1-dev
2012-12-03 10:21:15 -08:00
Daniel Sandler
0f92a8083d
Show alarm tile for the current user.
...
We were already refreshing the tile on user switch, but we
were only pulling the information (and observing changes)
for the owner.
Bug: 7596329
Change-Id: I33959af405bc79037b5b1321631d993bea65772f
2012-12-03 12:59:26 -05:00
Marco Nelissen
219acf1071
am eff8dadc: am f688ee5d: Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev
...
* commit 'eff8dadcbd336915874485b9ae4532421c07e768':
Change the text color of timer in MediaController
2012-12-03 08:23:44 -08:00
Marco Nelissen
eff8dadcbd
am f688ee5d: Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev
...
* commit 'f688ee5dcce1c30a0fd2092722bbbfc99ed9d445':
Change the text color of timer in MediaController
2012-12-03 08:22:01 -08:00
Marco Nelissen
f688ee5dcc
Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev
2012-12-03 08:19:51 -08:00
Daniel Sandler
e83665284a
am 5046ae56: Merge "framework: fix notification icons not animating till ticker is updated"
...
* commit '5046ae56675b5e81bd7160f12709d609d8b4c19c':
framework: fix notification icons not animating till ticker is updated
2012-12-03 08:11:37 -08:00
Daniel Sandler
5046ae5667
Merge "framework: fix notification icons not animating till ticker is updated"
2012-12-03 07:06:29 -08:00
Daniel Sandler
8ea9417338
am 56f0d47e: am 025b43cd: Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev
...
* commit '56f0d47ed86f9eb483db4f464971b2e17743b87d':
Fix rounding error when drawing panel handles.
2012-12-03 07:06:22 -08:00
Daniel Sandler
56f0d47ed8
am 025b43cd: Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev
...
* commit '025b43cd51580701221ad74d24276498418fce37':
Fix rounding error when drawing panel handles.
2012-12-03 07:04:01 -08:00
Daniel Sandler
025b43cd51
Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev
2012-12-03 07:00:59 -08:00
The Android Automerger
22eee8791b
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-03 06:06:43 -08:00
Scott Main
fb60f1f233
am ba7d95ae: am 16cf6436: am fbcb624b: Merge "docs: update reference links and misc revisions" into jb-mr1-dev
...
* commit 'ba7d95ae3bedb998d6fc0ca9cd9583252be68fd8':
docs: update reference links and misc revisions
2012-12-03 00:29:12 -08:00
Scott Main
ba7d95ae3b
am 16cf6436: am fbcb624b: Merge "docs: update reference links and misc revisions" into jb-mr1-dev
...
* commit '16cf643694194176954b709e5ee4dfcb711f2a57':
docs: update reference links and misc revisions
2012-12-03 00:27:29 -08:00
Scott Main
16cf643694
am fbcb624b: Merge "docs: update reference links and misc revisions" into jb-mr1-dev
...
* commit 'fbcb624be82e184482b547b09765a03db2305039':
docs: update reference links and misc revisions
2012-12-03 00:25:11 -08:00
Scott Main
fbcb624be8
Merge "docs: update reference links and misc revisions" into jb-mr1-dev
2012-12-03 00:22:23 -08:00
Scott Main
bd3b1ca82c
am 97fab2ca: am b86695d6: am b00e37de: docs: update location/maps doc with info for maps api
...
* commit '97fab2ca0213696fa140c4ecc7fcb61d0d75e804':
docs: update location/maps doc with info for maps api
2012-12-03 00:18:18 -08:00
