| commit | 47e11611ffaea29fb1234943283c5c6fe3607c73 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:19:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:19:33 2012 -0700 |
| tree | 4b507e25a71c842ad48ee2ed0ae39aa866624f58 | |
| parent | 89c4631e569cb3ef8b6523f5da10bf49da967666 [diff] | |
| parent | 9709d7fc11302ea17cfc5905395288c360099971 [diff] |
am 9709d7fc: (-s ours) am 310bc879: am 51535bf8: (-s ours) Reconcile with jb-release - do not merge * commit '9709d7fc11302ea17cfc5905395288c360099971':