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

94971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
1214e975d6 am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '3baf1b6f44c8f9f851e165f1b818a475b4b09fed':
  docs: add info about secure adb
 2013-02-13 10:10:08 -08:00
Scott Main
3baf1b6f44 am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '60d8836e0dcd46645d73ef7fb34257aef5e5a927':
  docs: add info about secure adb
 2013-02-13 10:08:43 -08:00
Scott Main
60d8836e0d am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'be4d1dcd0118e2933c8467a13d5e8cb7abbb9707':
  docs: add info about secure adb
 2013-02-13 10:07:47 -08:00
Scott Main
be4d1dcd01 am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'dd8b58457c6ce18ec98f1b2419300aa8c9cd326d':
  docs: add info about secure adb
 2013-02-13 10:05:41 -08:00
Scott Main
dd8b58457c Merge "docs: add info about secure adb" into jb-mr1-dev 2013-02-13 18:01:48 +00:00
Joe Fernandez
4c28487acd am 45df16aa: am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '45df16aa73c6665f55c86f4a9998e6b383b751ca':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:45:59 -08:00
Joe Fernandez
45df16aa73 am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '6e372639f8c9a3ccda58a9d6cc321abb60eb62b1':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:43:02 -08:00
Joe Fernandez
6e372639f8 am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '30890f2853dc7d2871d4485e2af3467bb7960b88':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:40:59 -08:00
Joe Fernandez
30890f2853 am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit 'c5cb262cc6bd47a5a2ad71866cb6d9961713842a':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:38:54 -08:00
Joe Fernandez
c5cb262cc6 Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 2013-02-13 17:35:22 +00:00
Joe Fernandez
798da53fa8 docs: Keystore/Cert warning for Signing Apps, Issue: 8180111 
Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2
 2013-02-13 09:26:57 -08:00
Joe Fernandez
c698a855d2 am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'd1c9d6e84969ee36f8a3b74515bae715727866a1':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:21:08 -08:00
Joe Fernandez
d1c9d6e849 am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '3b8381e1ed71258957718b8cc8dca46ee587c0fe':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:18:49 -08:00
Joe Fernandez
3b8381e1ed am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '7bb37c8748b6c7e36a18b7e55cc0b8af65b45099':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:16:16 -08:00
Joe Fernandez
7bb37c8748 am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '0480d5d88c95abebb073dc1ea5a2f20d5ffdef38':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:14:10 -08:00
Joe Fernandez
0480d5d88c Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 2013-02-13 15:10:16 +00:00
Scott Main
8d21b8811c am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (3) and others
* commit '6d32f4e86e0fa67561c26582b9a25581744212f1':
  lists.js files for gms and gcm
 2013-02-12 18:32:33 -08:00
Scott Main
6d32f4e86e am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (2) and others
* commit '64aa66d126b2c382ccbcc50e8690e75175074168':
  lists.js files for gms and gcm
 2013-02-12 18:31:08 -08:00
Scott Main
64aa66d126 am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android (Google) Code Review (1) and others
* commit 'b861a9455ce8018b859d8b670e58324d79d9fd3a':
  lists.js files for gms and gcm
 2013-02-12 18:30:05 -08:00
Scott Main
b861a9455c am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '4cb43d977bb610fc8e2789dc53334569f2aa55e8':
  lists.js files for gms and gcm
 2013-02-12 18:27:57 -08:00
Scott Main
4cb43d977b Merge "lists.js files for gms and gcm" into jb-mr1-dev 2013-02-13 02:24:57 +00:00
Robert Ly
373264b776 lists.js files for gms and gcm 
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
 2013-02-12 18:15:04 -08:00
Xavier Ducrohet
36ee5485b8 am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android Git Automerger (2) and others
* commit '5d5c05dee9911eaf8add2d4298641e60f2a113d5':
  Fix DateFormat for layoutlib.
 2013-02-12 15:52:46 -08:00
Xavier Ducrohet
5d5c05dee9 am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'b7a4aed94eb02731057fdf78eb7bafc8ececadc9':
  Fix DateFormat for layoutlib.
 2013-02-12 15:50:16 -08:00
Xavier Ducrohet
b7a4aed94e am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and Xavier Ducrohet (1)
* commit 'f70b8c1cebbf873031bc92bb6ae3be813830d300':
  Fix DateFormat for layoutlib.
 2013-02-12 15:48:07 -08:00
Xavier Ducrohet
f70b8c1ceb Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 2013-02-12 23:44:57 +00:00
Jean-Baptiste Queru
2d130ceede am c5748148: Merge "Revert "makefile changes for gcm javadocs"" 
# By Robert Ly
# Via Gerrit Code Review (1) and Jean-Baptiste Queru (1)
* commit 'c5748148c56e129e7b5cec7fac0921ce7967d054':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 15:22:06 -08:00
Scott Main
03c54e77d4 docs: add info about secure adb 
Change-Id: I6edf5bf20bce328c1e4cb2ec33f01a1439e2dbfa
 2013-02-12 14:47:17 -08:00
Jean-Baptiste Queru
c5748148c5 Merge "Revert "makefile changes for gcm javadocs"" 2013-02-12 22:32:30 +00:00
Xavier Ducrohet
47a021f764 Fix DateFormat for layoutlib. 
Change-Id: I389c9d106b93b9f81dd3614398a5b66ba2b39a70
 2013-02-12 14:05:32 -08:00
Robert Ly
16e8c1ed1b Revert "makefile changes for gcm javadocs" 
This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e

Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
 2013-02-12 14:00:39 -08:00
Robert Ly
e47033f929 am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android Git Automerger (3) and Android (Google) Code Review (2)
* commit '4d9aa17a1efcc76fbbd30c1b20338c0d888ae1e8':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:56:30 -08:00
Robert Ly
4d9aa17a1e am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit '87db373a091b1126f2233e053f9549042564870a':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:54:01 -08:00
Robert Ly
87db373a09 am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit '2328a77980a8e4aa2dafac1b9a8e228877a7425c':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:51:52 -08:00
Robert Ly
2328a77980 am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android (Google) Code Review
* commit '9eb66b2db4724da7a2d6575fee29840004f1a5df':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:49:44 -08:00
Robert Ly
9eb66b2db4 Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 2013-02-12 21:46:07 +00:00
Robert Ly
d3b50de375 Revert "makefile changes for gcm javadocs" 
This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e

Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
 2013-02-12 21:39:28 +00:00
Marco Nelissen
789e3fa052 am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 
# Via Gerrit Code Review
* commit '9f03d4f921fab5757a791653891ce73c2d006e20':
  Revert "use utf8_length() instead of local function, isValidUtf8()"
 2013-02-12 11:14:48 -08:00
Robert Ly
6db8797827 am f38aed8c: am f303a7fd: am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android Git Automerger (3) and Android (Google) Code Review (2)
* commit 'f38aed8c2c0eaceac0176ff2ddec6db50f4a4080':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:48:07 -08:00
Marco Nelissen
9f03d4f921 Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 2013-02-12 18:46:22 +00:00
Robert Ly
f38aed8c2c am f303a7fd: am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit 'f303a7fd774f97eca79bfa44eb7d25a394d0abf4':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:44:55 -08:00
Robert Ly
f303a7fd77 am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit 'a95a64ddd6155e90308aa1368e2c8098d86e677f':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:43:16 -08:00
Robert Ly
a95a64ddd6 am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android (Google) Code Review
* commit 'dc8ee2066a45adc6a57157c550e65317c8650ca0':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:41:20 -08:00
Robert Ly
dc8ee2066a Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 2013-02-12 18:37:51 +00:00
Marco Nelissen
a0a73ed1e6 Revert "use utf8_length() instead of local function, isValidUtf8()" 
This reverts commit 1a8b6c29aaa5a1591097daca0876808cc029cbda

Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni  check.

Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
 2013-02-12 18:33:41 +00:00
Robert Ly
343a89c2cd Revert "makefile changes for s.a.c" 
This reverts commit 4c01047ec7b06aabeeae273c7871caa6c3029b84

Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc
 2013-02-12 18:29:10 +00:00
Scott Main
4cd50a1212 am b8656b3c: am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'b8656b3c7af99c8951459661fa5352adde5d2645':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 16:59:42 -08:00
Scott Main
b8656b3c7a am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Android Git Automerger (2) and Scott Main (1)
* commit '42ac0372159e3204f20de0ad94e51932aab4a030':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 16:57:14 -08:00
Scott Main
42ac037215 am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Android Git Automerger (1) and Scott Main (1)
* commit '7209135504313c27da4f277235e00db6851b9577':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 16:55:08 -08:00
Scott Main
7209135504 am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Scott Main
* commit 'bfec2a01896959ba2bc9a995238eb31644ea8dc6':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 16:52:51 -08:00