commit | 00098d34be7209b0ee8a514d8f79a22d63a13e08 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:33:31 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:33:31 2012 -0700 |
tree | 18128e34394e5b2ae5a8c9b6af495926c929daac | |
parent | 16f63bc9f92391a2a5b35965f69ca842323531f0 [diff] | |
parent | 3115999c7c611f0466207edd727209fe41f045ce [diff] |
am 3115999c: (-s ours) Reconcile with jb-mr1-factory-release - do not merge * commit '3115999c7c611f0466207edd727209fe41f045ce':