| commit | 710aeba1ce0bf2d121aaaf659284074750b43c6e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 08:21:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 08:21:38 2012 -0700 |
| tree | c0c1005663c89a6cd9c6b66b040b6098b9d78732 | |
| parent | ee04e47216ca947dfc781d1b4116f252dd2aa5a4 [diff] | |
| parent | c53ce26836eccfe9c0bb315d965bc73a9bd7b214 [diff] |
am c53ce268: (-s ours) Reconcile with jb-release - do not merge * commit 'c53ce26836eccfe9c0bb315d965bc73a9bd7b214':