| commit | 7bcdbc85e14b6e7d7ed05498cf5e15025fd0cad2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:48:52 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 05 13:48:52 2013 -0800 |
| tree | 5f1a866cdd1e08522ebc754542baa6b9d1fe05ff | |
| parent | 535529332ff2fcf901e7a062e133aed54a03c13a [diff] | |
| parent | 0ee0fa2f625c61ee6e631dceb0ee81918fd96df3 [diff] |
am 0ee0fa2f: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (3) and The Android Open Source Project (1) * commit '0ee0fa2f625c61ee6e631dceb0ee81918fd96df3':