| commit | 78846101df798db98a25901a40b2741e599bac51 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:54:42 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 07:54:42 2012 -0800 |
| tree | 0b8f32726cd59693301559288c5b108e40eda727 | |
| parent | 4fedfdaa44d451e228892be15825f2b9c60fd751 [diff] | |
| parent | 9e69716c9588124e924f1461e5a9f7db413157dc [diff] |
am 9e69716c: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '9e69716c9588124e924f1461e5a9f7db413157dc':