Scott Main
de6082551d
am 882c97b5: am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev
...
* commit '882c97b59a8ef89ff8efa9064829f8014b9a7638':
docs: add api overview for jb
2012-06-26 21:59:44 -07:00
Scott Main
882c97b59a
am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev
...
* commit 'cdb3f9c45b97a64380f044c6b8c1863c1ba58b6a':
docs: add api overview for jb
2012-06-26 21:56:17 -07:00
Scott Main
cdb3f9c45b
Merge "docs: add api overview for jb" into jb-dev
2012-06-26 21:54:08 -07:00
Scott Main
60dd520d37
docs: add api overview for jb
...
Change-Id: Ibb916138026bb13bb424c826fe8faa563c71bf94
2012-06-26 21:41:25 -07:00
Dianne Hackborn
ca6f644e4e
Fix build.
...
Change-Id: I9e363c1c01716d2eee7a4339690d285dc92a2d32
2012-06-26 19:08:57 -07:00
Dianne Hackborn
0e5416f661
Merge "Use two fingers to work some magic..."
2012-06-26 18:16:01 -07:00
Robert Ly
19a53dc66e
am ea53ebc8: am aa16a2e0: Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev
...
* commit 'ea53ebc8ddc92fce146513203e5fbef800d2b39d':
docs: remove graphics rs docs and restructure existing docs
2012-06-26 18:04:16 -07:00
Robert Ly
ea53ebc8dd
am aa16a2e0: Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev
...
* commit 'aa16a2e055737869609ce52e563b9175607ae52d':
docs: remove graphics rs docs and restructure existing docs
2012-06-26 18:01:36 -07:00
Robert Ly
aa16a2e055
Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev
2012-06-26 17:58:57 -07:00
Robert Ly
864090eeaa
docs: remove graphics rs docs and restructure existing docs
...
Change-Id: I8603c827095143327053e8eba855177ec466a948
2012-06-26 17:51:19 -07:00
Mike Lockwood
68ff8cbc38
am 1524e625: am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev
...
* commit '1524e625067da52e1365e4f939d4683edeea2fd5':
MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
2012-06-26 17:01:53 -07:00
Mike Lockwood
1524e62506
am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev
...
* commit '7017d51e147a0f6ed2370fb79c656c9726304131':
MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
2012-06-26 16:59:07 -07:00
Scott Main
899825c55e
am 32ef7ef6: am 947ce39e: Merge "docs: add landing for gcm" into jb-dev
...
* commit '32ef7ef6c8ced560211a3efe5fddc435a2e58916':
docs: add landing for gcm
2012-06-26 16:58:38 -07:00
Mike Lockwood
7017d51e14
Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev
2012-06-26 16:57:02 -07:00
Scott Main
32ef7ef6c8
am 947ce39e: Merge "docs: add landing for gcm" into jb-dev
...
* commit '947ce39e5648851a5a49e71e22d187402ff1337d':
docs: add landing for gcm
2012-06-26 16:55:52 -07:00
Scott Main
947ce39e56
Merge "docs: add landing for gcm" into jb-dev
2012-06-26 16:53:44 -07:00
Joe Fernandez
6d626725b9
am bcfeefa0: am 3632af39: Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev
...
* commit 'bcfeefa09479c518d492aa35947c6f85d1af29a0':
docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1
2012-06-26 16:50:19 -07:00
Joe Fernandez
5a119df462
am 3e975309: am 623898f0: Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev
...
* commit '3e975309bfff260f7e8c9b75b2c802fd2c442dec':
docs: GL Tracer, Device Monitor Tools for SDK r20
2012-06-26 16:50:16 -07:00
Joe Fernandez
bcfeefa094
am 3632af39: Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev
...
* commit '3632af395c26951393f7e5289510c701c8d9f00b':
docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1
2012-06-26 16:47:28 -07:00
Joe Fernandez
3e975309bf
am 623898f0: Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev
...
* commit '623898f099d8ab99f638fbd8062f3c227800fdf5':
docs: GL Tracer, Device Monitor Tools for SDK r20
2012-06-26 16:47:26 -07:00
Robert Ly
93b4fbef19
docs: add landing for gcm
...
Change-Id: Icfe158670c0a07a6dffed496a444e49b5c5ef926
2012-06-26 16:46:21 -07:00
Joe Fernandez
3632af395c
Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev
2012-06-26 16:45:31 -07:00
Joe Fernandez
623898f099
Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev
2012-06-26 16:45:12 -07:00
Dianne Hackborn
5359bc38a2
am 2e8295ce: am 3bb98aec: Merge "Fix issue #6730064 : When turning off Nakasi, it very often..." into jb-dev
...
* commit '2e8295ce1861d8284f16e0f0f80475db0ec2983f':
Fix issue #6730064 : When turning off Nakasi, it very often...
2012-06-26 16:40:48 -07:00
Dianne Hackborn
2e8295ce18
am 3bb98aec: Merge "Fix issue #6730064 : When turning off Nakasi, it very often..." into jb-dev
...
* commit '3bb98aec9344af1299b90d1567b4443e4d50cc91':
Fix issue #6730064 : When turning off Nakasi, it very often...
2012-06-26 16:38:00 -07:00
Dianne Hackborn
3bb98aec93
Merge "Fix issue #6730064 : When turning off Nakasi, it very often..." into jb-dev
2012-06-26 16:36:36 -07:00
Mike Lockwood
1e855d98aa
MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
...
Bug: 6684451
Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-06-26 16:33:05 -07:00
Joe Fernandez
3e820bee2b
docs: GL Tracer, Device Monitor Tools for SDK r20
...
Change-Id: Ib45210b88a7eb93e3bba4f7d535f344ccb054a72
2012-06-26 16:27:18 -07:00
Katie McCormick
4fb85d3515
am 70585ac6: am eb2ab860: Merge "Doc update: Adding new GCM docs." into jb-dev
...
* commit '70585ac646998f4c6773b8c17c48210419bf676f':
Doc update: Adding new GCM docs.
2012-06-26 15:33:21 -07:00
Katie McCormick
70585ac646
am eb2ab860: Merge "Doc update: Adding new GCM docs." into jb-dev
...
* commit 'eb2ab860259af98f0f640dc10f1c5fce7a17cbc1':
Doc update: Adding new GCM docs.
2012-06-26 15:30:48 -07:00
Katie McCormick
eb2ab86025
Merge "Doc update: Adding new GCM docs." into jb-dev
2012-06-26 15:29:05 -07:00
Katie McCormick
76c6d86b5e
Doc update: Adding new GCM docs.
...
Change-Id: I98dcbad644e416538f6dcad64a063809f8662e24
2012-06-26 14:55:45 -07:00
Dianne Hackborn
ea401541c5
Fix issue #6730064 : When turning off Nakasi, it very often...
...
...turns itself immediately back on.
The ON_AFTER_RELEASE flag is documented to not turn the screen on if
it is currently off.
Unfortunately, it didn't seem to actually do this -- it would just
cause a userActivity() call, which turns on the screen if it is
currently off.
Fix this by adding yet another boolean to that function to tell it
to not poke user activity if the screen is off. (Yes the number of
booleans on it is now insane, and should be cleaned up after we
get through JB.)
Bug: 6730064
Change-Id: I850dfbc777c7668d08b7d63f42a293e22b878256
2012-06-26 14:44:08 -07:00
Joe Fernandez
d80f095efb
am 719ff2c4: am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev
...
* commit '719ff2c4684254074ee9071ffa20aa6f684f921c':
docs: ADK 2012 documentation with AOA protocol docs
2012-06-26 13:19:56 -07:00
Joe Fernandez
719ff2c468
am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev
...
* commit 'fb4a0e452b81794884b95daa2121a9953ade4e36':
docs: ADK 2012 documentation with AOA protocol docs
2012-06-26 13:17:38 -07:00
Peter Ng
c3bc9efee4
am 7b6698e7: am 3c6f8e4d: Merge "image typos in documents fix" into jb-dev
...
* commit '7b6698e7bee3b62ec95c1620e2be75af14a4c360':
image typos in documents fix
2012-06-26 13:16:38 -07:00
Gilles Debunne
704c79a497
am 034a5776: am f6656b80: Merge "Reducing the contrast of text underline" into jb-dev
...
* commit '034a57764b6791fd894285df78e02ad2d20992cd':
Reducing the contrast of text underline
2012-06-26 13:16:35 -07:00
Joe Fernandez
fb4a0e452b
Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev
2012-06-26 13:15:26 -07:00
Peter Ng
7b6698e7be
am 3c6f8e4d: Merge "image typos in documents fix" into jb-dev
...
* commit '3c6f8e4da0abc47b0d52e47edefa694bd81b8042':
image typos in documents fix
2012-06-26 13:14:25 -07:00
Gilles Debunne
034a57764b
am f6656b80: Merge "Reducing the contrast of text underline" into jb-dev
...
* commit 'f6656b80c203a2537aa30682f7e682a69e742e21':
Reducing the contrast of text underline
2012-06-26 13:14:23 -07:00
Peter Ng
3c6f8e4da0
Merge "image typos in documents fix" into jb-dev
2012-06-26 13:12:45 -07:00
Gilles Debunne
f6656b80c2
Merge "Reducing the contrast of text underline" into jb-dev
2012-06-26 13:12:07 -07:00
Robert Ly
2fef717699
am dcf4eeb0: am 95bb4099: Merge "docs: rs api docs" into jb-dev
...
* commit 'dcf4eeb0363399279c1905eaffb825dc722301b4':
docs: rs api docs
2012-06-26 12:17:54 -07:00
Robert Ly
dcf4eeb036
am 95bb4099: Merge "docs: rs api docs" into jb-dev
...
* commit '95bb409981496b23448f02df34faaf384ca28a9f':
docs: rs api docs
2012-06-26 12:15:26 -07:00
Robert Ly
95bb409981
Merge "docs: rs api docs" into jb-dev
2012-06-26 12:14:04 -07:00
Robert Ly
fd73b5844c
docs: rs api docs
...
Change-Id: Ib2f1ae1ba47118242d4a52b943f5eba26714aa1f
2012-06-26 12:07:13 -07:00
Peter Ng
c36b8655b9
image typos in documents fix
...
Change-Id: I357ff2d99bc2dff9ac27cfd6d1e97afb35740dbc
2012-06-26 11:18:29 -07:00
Kenny Root
25a525411b
am 7d33d0c3: am c17f92ce: Merge "Use removePackageLI instead of removing mPackages" into jb-dev
...
* commit '7d33d0c36c7e8c9de4139af383f7491823055bc7':
Use removePackageLI instead of removing mPackages
2012-06-26 10:39:24 -07:00
Kenny Root
7d33d0c36c
am c17f92ce: Merge "Use removePackageLI instead of removing mPackages" into jb-dev
...
* commit 'c17f92ce047e8d62fac829d1df5dae654f7e4de8':
Use removePackageLI instead of removing mPackages
2012-06-26 10:36:54 -07:00
Kenny Root
c17f92ce04
Merge "Use removePackageLI instead of removing mPackages" into jb-dev
2012-06-26 10:34:44 -07:00
