commit | 08ea3b10b482d4d08e59e03291d2feb3b361500d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:27:13 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:27:13 2012 -0800 |
tree | 51bac729f7186c76f114019f891c6388dc2022b7 | |
parent | 26f928cebc20dbe74f8fcadb42d9fbe68d88ea8a [diff] | |
parent | 5535a9e9806775dd09279e9fe415565ced30f3ae [diff] |
am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '5535a9e9806775dd09279e9fe415565ced30f3ae':