| commit | ec43a11104036e92556f9c25e80704c678d6e3a5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:08:02 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:08:02 2012 -0700 |
| tree | 1ed1f721203cb984602869b5295a92dc44453272 | |
| parent | ee142ce3913524dbdf3a4161771b48f362e5f1d8 [diff] | |
| parent | ff8634a18c99818e13cbac2eeb8073ecda18e40e [diff] |
am ff8634a1: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ff8634a18c99818e13cbac2eeb8073ecda18e40e':