commit | 8be5ea335c6aacb2af1f3c77b19db9509f26e601 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:30:11 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:30:11 2012 -0800 |
tree | 38d9ca70713201a2d5a8e00f590eaf320b9c4516 | |
parent | ed9208c36ae0d0d93f93412e76eb0ce7d41eed7b [diff] | |
parent | 07c8a6d238ddf855d5d6b4421d2527c580a374b6 [diff] |
am 07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '07c8a6d238ddf855d5d6b4421d2527c580a374b6':