Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Squashed commit of the following: | Andreas Huber | 2009-07-16 | 5 | -0/+813 |
* | rename libsgl/libcorecg to libskia | Mike Reed | 2009-07-10 | 1 | -2/+1 |
* | Merge commit 'goog/master' into merge_master | Mathias Agopian | 2009-07-06 | 12 | -619/+1194 |
|\ | |||||
| * | am 3383df38: Merge change 6198 into donut | Android (Google) Code Review | 2009-07-06 | 1 | -0/+53 |
| |\ | |||||
| | * | Merge change 6198 into donut | Android (Google) Code Review | 2009-07-06 | 1 | -0/+53 |
| | |\ | |||||
| | | * | keystore: Provide a generic getter for native components. | Chia-chi Yeh | 2009-07-06 | 1 | -0/+53 |
| * | | | am 699ca3f2: Add password field for WiFi configuration. | Chung-yih Wang | 2009-07-06 | 1 | -4/+12 |
| |\ \ \ | | |/ / | |||||
| | * | | Add password field for WiFi configuration. | Chung-yih Wang | 2009-07-05 | 1 | -4/+12 |
| | |/ | |||||
| * | | am 24ad29c6: Merge change 6177 into donut | Android (Google) Code Review | 2009-07-06 | 3 | -1/+10 |
| |\ \ | | |/ | |||||
| | * | Two small checks in keymgmt. | Chung-yih Wang | 2009-07-03 | 3 | -1/+10 |
| * | | am d23d7f2d: Add a \'wipe\' operation to Bmgr | Christopher Tate | 2009-07-06 | 1 | -0/+26 |
| |\ \ | | |/ | |||||
| | * | Add a 'wipe' operation to Bmgr | Christopher Tate | 2009-07-02 | 1 | -0/+26 |
| * | | am 7de4bd9b: Merge change 6045 into donut | Android (Google) Code Review | 2009-07-03 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Remove the null-termination for Java string compatibility. | Chung-yih Wang | 2009-07-02 | 1 | -1/+1 |
| * | | am d45dcbec: Merge change 5615 into donut | Android (Google) Code Review | 2009-07-03 | 10 | -619/+1098 |
| |\ \ | | |/ | |||||
| | * | Merge change 5615 into donut | Android (Google) Code Review | 2009-07-02 | 10 | -619/+1098 |
| | |\ | |||||
| | | * | Implement the generic mini-keystore for security. | Chung-yih Wang | 2009-07-02 | 10 | -619/+1098 |
* | | | | Merge commit 'goog/master' into merge_master | Mathias Agopian | 2009-07-01 | 1 | -18/+163 |
|\ \ \ \ | |/ / / | |||||
| * | | | am ab4748c6: Merge change 5694 into donut | Android (Google) Code Review | 2009-07-01 | 1 | -0/+55 |
| |\ \ \ | | |/ / | |||||
| | * | | Implement persistent enable/disable of the backup manager | Christopher Tate | 2009-06-29 | 1 | -0/+55 |
| | |/ | |||||
| * | | am 91717497: Use system properties to track the current transport | Christopher Tate | 2009-06-29 | 1 | -11/+54 |
| |\ \ | | |/ | |||||
| | * | Use system properties to track the current transport | Christopher Tate | 2009-06-26 | 1 | -11/+54 |
| * | | am 156411df: Use a long for restore token | Dan Egnor | 2009-06-29 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Use a long for restore token | Dan Egnor | 2009-06-26 | 1 | -2/+2 |
| * | | am c73a218c: Add some error reporting & info to bmgr\'s output | Christopher Tate | 2009-06-29 | 1 | -3/+17 |
| |\ \ | | |/ | |||||
| | * | Add some error reporting & info to bmgr's output | Christopher Tate | 2009-06-26 | 1 | -3/+17 |
| * | | am 4a64bded: Add some helpful tests scripts for backup and make bmgr restore ... | Joe Onorato | 2009-06-25 | 1 | -11/+33 |
| |\ \ | | |/ | |||||
| | * | Add some helpful tests scripts for backup and make bmgr restore wait until th... | Joe Onorato | 2009-06-25 | 1 | -11/+33 |
| * | | am 5e8a4b84: Give the bmgr command an IRestoreObserver too. | Joe Onorato | 2009-06-25 | 1 | -2/+13 |
| |\ \ | | |/ | |||||
| | * | Give the bmgr command an IRestoreObserver too. | Joe Onorato | 2009-06-25 | 1 | -2/+13 |
* | | | merge master in master_gl | Mathias Agopian | 2009-06-24 | 1 | -2/+17 |
|\ \ \ | |/ / | |||||
| * | | am 9c8dd55a: Fix bug 1829561 ("am profile" with bad filename kills process). | Dianne Hackborn | 2009-06-24 | 1 | -2/+17 |
| |\ \ | | |/ | |||||
| | * | Fix bug 1829561 ("am profile" with bad filename kills process). | Dianne Hackborn | 2009-06-24 | 1 | -2/+17 |
* | | | Merge commit 'goog/master' into merge_master | Mathias Agopian | 2009-06-19 | 5 | -101/+310 |
|\ \ \ | |/ / | |||||
| * | | am abce4e87: Use signatures on restore | Christopher Tate | 2009-06-18 | 1 | -0/+21 |
| |\ \ | | |/ | |||||
| | * | Use signatures on restore | Christopher Tate | 2009-06-18 | 1 | -0/+21 |
| * | | am 9fbeb7da: Merge change 4337 into donut | Android (Google) Code Review | 2009-06-17 | 3 | -72/+235 |
| |\ \ | | |/ | |||||
| | * | Merge change 4337 into donut | Android (Google) Code Review | 2009-06-16 | 3 | -72/+235 |
| | |\ | |||||
| | | * | Change the keystore APIs. | Chung-yih Wang | 2009-06-17 | 3 | -72/+235 |
| * | | | am 5f15d151: checkpoint BackupDatAInput / RestoreHelper | Joe Onorato | 2009-06-17 | 1 | -24/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | checkpoint BackupDatAInput / RestoreHelper | Joe Onorato | 2009-06-16 | 1 | -24/+5 |
| * | | | am febde5fc: Merge change 4389 into donut | Android (Google) Code Review | 2009-06-16 | 1 | -5/+49 |
| |\ \ \ | | |/ / | |||||
| | * | | More bmgr work; fix clear-data signalling | Christopher Tate | 2009-06-16 | 1 | -5/+49 |
| | |/ | |||||
* | | | Merge commit 'goog/master' into merge_master | Mathias Agopian | 2009-06-16 | 9 | -0/+853 |
|\ \ \ | |/ / | |||||
| * | | am 7f148d65: Merge change 4316 into donut | Android (Google) Code Review | 2009-06-16 | 1 | -4/+0 |
| |\ \ | | |/ | |||||
| | * | Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel... | Mike Lockwood | 2009-06-16 | 1 | -4/+0 |
| * | | am 6297cb2e: Merge change 4287 into donut | Android (Google) Code Review | 2009-06-16 | 5 | -0/+379 |
| |\ \ | | |/ | |||||
| | * | Sketch out a 'bmgr' command line tool | Christopher Tate | 2009-06-15 | 5 | -0/+379 |
| * | | am 3cf0dd6a: Merge change 3940 into donut | Android (Google) Code Review | 2009-06-12 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | Merge change 3940 into donut | Android (Google) Code Review | 2009-06-11 | 1 | -0/+4 |
| | |\ |