| commit | a6eba6c86dedcd6134a54efa8f6761b336383f31 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 08:31:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 08:31:24 2012 -0700 |
| tree | 5a6910f2de42e0d78c005c62b2490f3d2663648e | |
| parent | 62757e02b0a9ab6622e02a59ccaf92f53ce25967 [diff] | |
| parent | 75ad34327739a02f76ecfae06d9026de3834e6b2 [diff] |
am 75ad3432: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '75ad34327739a02f76ecfae06d9026de3834e6b2':