drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,506 Commits 1 Branch 0 Tags
Commit Graph

171506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
8caa6f67dd am e6e140ab: am 3aa8271a: am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
automerge: 129ace2

* commit '129ace2ffac49070ee7a38511716b7f49a6d78da':
 2014-11-03 22:51:33 +00:00
smain@google.com
6d4191f9b5 am 07d46a38: am 7c2f87ec: am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
automerge: 2e966db

* commit '2e966db50859e9d243f2815624efa83d224c812f':
 2014-11-03 22:50:25 +00:00
Joe Fernandez
efa9f725e9 am 1c337a11: am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
automerge: 554d4b1

* commit '554d4b123b27aabc9283dd92c122c3cf53b9670a':
  docs: Update Android Dashboard for November 2014
 2014-11-03 22:48:27 +00:00
Jim Miller
c02b02806f am ff25dd06: am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev 
automerge: a3a0cd7

* commit 'a3a0cd7f9014a7d6db51197c54ebadd2e3973ba2':
  Fix SetupWizard black screen issue for EDU devices
 2014-11-03 22:47:02 +00:00
Rich Slogar
129ace2ffa am e6e140ab: am 3aa8271a: am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit 'e6e140abfbc055291a8a945f3ae54aa38f971af5':
 2014-11-03 22:32:09 +00:00
smain@google.com
2e966db508 am 07d46a38: am 7c2f87ec: am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
* commit '07d46a3880172209fb9a82e9828ea13d93f47622':
 2014-11-03 22:32:03 +00:00
Joe Fernandez
554d4b123b am 1c337a11: am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit '1c337a11d724a2e745423c2918d45aae501c607c':
  docs: Update Android Dashboard for November 2014
 2014-11-03 22:31:38 +00:00
Jim Miller
a3a0cd7f90 am ff25dd06: am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev 
* commit 'ff25dd06a3d8c0ba3bade95c67720612cfb04ef3':
  Fix SetupWizard black screen issue for EDU devices
 2014-11-03 22:31:31 +00:00
Rich Slogar
e6e140abfb am 3aa8271a: am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit '3aa8271afc20fb3a7cbdd3c317029963ad41c512':
 2014-11-03 20:45:29 +00:00
smain@google.com
07d46a3880 am 7c2f87ec: am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
* commit '7c2f87ec560c4b75f8750a6fa9b81cdef51be8c6':
 2014-11-03 20:45:24 +00:00
Rich Slogar
3aa8271afc am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit '4f62925ecb2f049aec7392f84d494328f883cb92':
 2014-11-03 20:37:59 +00:00
smain@google.com
7c2f87ec56 am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
* commit '0646885ddfb5c04cd0c5276e66b51b1a14691c4c':
 2014-11-03 20:37:55 +00:00
Rich Slogar
4f62925ecb am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit 'a34b1f15292d219b6e2c13fd6f685735c8dd8f8c':
 2014-11-03 20:29:55 +00:00
smain@google.com
0646885ddf am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
* commit 'c64c937a18be1205170ad95b7f601a6e0192b9b9':
 2014-11-03 20:29:51 +00:00
Rich Slogar
a34b1f1529 am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 
automerge: f07d984

* commit 'f07d984fed70be0718e7e9019bc933f58fbeca46':
 2014-11-03 20:21:20 +00:00
smain@google.com
c64c937a18 am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
automerge: 90ab19b

* commit '90ab19bb8dec2e444e274ab4c8990545b481ca7b':
 2014-11-03 20:20:13 +00:00
Joe Fernandez
1c337a11d7 am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit '2cc032d5ea8650ff22b58b05bb19e9cc039b872e':
  docs: Update Android Dashboard for November 2014
 2014-11-03 20:05:06 +00:00
Jim Miller
ff25dd06a3 am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev 
* commit '12b239e6d39ad5a35f68e7bcd5f644a793b5cb74':
  Fix SetupWizard black screen issue for EDU devices
 2014-11-03 20:00:43 +00:00
Joe Fernandez
2cc032d5ea am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit 'badfcbec48e6904316bec731e22c52bb7cca25fb':
  docs: Update Android Dashboard for November 2014
 2014-11-03 19:57:46 +00:00
Jim Miller
12b239e6d3 Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev 2014-11-03 19:51:53 +00:00
Joe Fernandez
badfcbec48 am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit '4f8399c7ad4f7e14e3846494c9aa2b88bfd343d9':
  docs: Update Android Dashboard for November 2014
 2014-11-03 19:51:42 +00:00
Joe Fernandez
4f8399c7ad am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit 'eff5efac2170e05b2a5e197788bf455edee57cce':
  docs: Update Android Dashboard for November 2014
 2014-11-03 19:41:56 +00:00
Joe Fernandez
eff5efac21 Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 2014-11-03 19:37:20 +00:00
Joe Fernandez
9dc852ac69 docs: Update Android Dashboard for November 2014 
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
 2014-11-03 11:33:28 -08:00
Kenny Root
d130ba8b00 am affff329: am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'affff329088e569158e0ee45ee0e580b3c285722':
  Track change to Conscrypt
 2014-11-03 18:58:09 +00:00
Kenny Root
affff32908 am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'd00ced983ee235f72a9261fd967309a2638dde05':
  Track change to Conscrypt
 2014-11-03 18:50:21 +00:00
Mike Lockwood
d89fab1385 am f9de1025: am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev automerge: 61cf7e0 
* commit 'f9de10252f96a136784de9d79cfcc1ab9e30d13f':
  Fix USB audio disconnect logic
 2014-11-03 18:50:15 +00:00
John Reck
6398d2d42e am 8a8a4055: am 541641d0: Merge "Fix counting" into lmp-mr1-dev automerge: 5c8d135 
* commit '8a8a40556ea3b0fb4cc8cd1ec063fb9988db497f':
  Fix counting
 2014-11-03 18:50:10 +00:00
Adrian Roos
9b40ce39f7 am 70fd44fa: am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev automerge: 7736d37 
* commit '70fd44fa022351b4451e61a7f0927362f4e33da8':
  Improve TrustManagerService user lifecycle
 2014-11-03 18:50:06 +00:00
Mike Lockwood
f9de10252f am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev 
automerge: 61cf7e0

* commit '61cf7e0fe7e79df53ff00a25241041ec99096105':
  Fix USB audio disconnect logic
 2014-11-03 18:45:52 +00:00
Mike Lockwood
61cf7e0fe7 am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev 
* commit '946863b63c05eb3ea38f422d5a198e95b0cc2aaa':
  Fix USB audio disconnect logic
 2014-11-03 18:44:12 +00:00
John Reck
8a8a40556e am 541641d0: Merge "Fix counting" into lmp-mr1-dev 
automerge: 5c8d135

* commit '5c8d135920896af42de8d8b91975abe3fa871cd9':
  Fix counting
 2014-11-03 18:42:30 +00:00
John Reck
d0f91ebaef am 43973c9d: am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev automerge: 9280480 
* commit '43973c9d732d74dec12e796fb40ae285c1687d6a':
  Fix cancel crash
 2014-11-03 18:41:39 +00:00
Adrian Roos
70fd44fa02 am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 
automerge: 7736d37

* commit '7736d37568980fdcee9c261de8a207977a720bb9':
  Improve TrustManagerService user lifecycle
 2014-11-03 18:41:28 +00:00
Kenny Root
d00ced983e am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
 2014-11-03 18:40:55 +00:00
John Reck
5c8d135920 am 541641d0: Merge "Fix counting" into lmp-mr1-dev 
* commit '541641d0334546d61bca13125ab2a36380dc662d':
  Fix counting
 2014-11-03 18:39:51 +00:00
Adrian Roos
7736d37568 am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 
* commit '698078a7e9a59d5e4cf959a761ccb9a74377cfa4':
  Improve TrustManagerService user lifecycle
 2014-11-03 18:39:46 +00:00
Mike Lockwood
946863b63c Merge "Fix USB audio disconnect logic" into lmp-mr1-dev 2014-11-03 18:38:14 +00:00
John Reck
541641d033 Merge "Fix counting" into lmp-mr1-dev 2014-11-03 18:35:59 +00:00
Kenny Root
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
Adrian Roos
698078a7e9 Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 2014-11-03 18:33:54 +00:00
John Reck
88f5fc7c5a Fix counting 
Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
 2014-11-03 10:32:24 -08:00
John Reck
43973c9d73 am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev 
automerge: 9280480

* commit '928048040cb5cd205ff5e74f9393dca2371c519a':
  Fix cancel crash
 2014-11-03 18:32:20 +00:00
John Reck
928048040c am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev 
* commit '1787b4ea436f361e16c289755fa1a35c6e1c8845':
  Fix cancel crash
 2014-11-03 18:31:17 +00:00
John Reck
1787b4ea43 Merge "Fix cancel crash" into lmp-mr1-dev 2014-11-03 18:27:41 +00:00
Geoff Mendal
7526d81d43 am d90238eb: (-s ours) am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 2589d8e -s ours 
* commit 'd90238eb150860f94bdae4515cb61515aed1490f':
  Import translations. DO NOT MERGE
 2014-11-03 18:15:56 +00:00
Geoff Mendal
d90238eb15 am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
automerge: 2589d8e  -s ours

* commit '2589d8e12de80535defb6e8ddae5ca971a64feb5':
  Import translations. DO NOT MERGE
 2014-11-03 18:08:15 +00:00
Geoff Mendal
2589d8e12d am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '188416bf38a2531158a8447f0f7b5719f22a39fd':
  Import translations. DO NOT MERGE
 2014-11-03 18:06:55 +00:00
Geoff Mendal
28e1db7ff4 am cd43c99c: (-s ours) am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 3765ae9 -s ours 
* commit 'cd43c99cce3a0ee0df34be3eda795d1e70497446':
  Import translations. DO NOT MERGE
 2014-11-03 18:02:26 +00:00
Geoff Mendal
6d94373ed6 am ffada671: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 6bdbeba -s ours 
* commit 'ffada671db0fefd98464185651ead1b78df00f21':
  Import translations. DO NOT MERGE
 2014-11-03 18:02:22 +00:00