commit | edfd0cb4a7636feb039f940bccbd2f8f61a2de53 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:24:31 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:24:31 2012 -0800 |
tree | a0779929f5bf9cb795ef05a4972985565d41e50c | |
parent | 9ed2d0b205f38168e2c4ee7410ad1ca3528cb15f [diff] | |
parent | 99a2df71960f4323500b3f1f56e95c53146594c1 [diff] |
am 99a2df71: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '99a2df71960f4323500b3f1f56e95c53146594c1':