commit | 377799e0c9dc852d706f6a6529e98e261c55a694 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:29:08 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:29:08 2012 -0800 |
tree | 79760d156afa8f22b5eb9ce96ceb73f89fd04b34 | |
parent | 2eb76f62569f8d2f3aaa2072f1466157ee15ab99 [diff] | |
parent | edfd0cb4a7636feb039f940bccbd2f8f61a2de53 [diff] |
am edfd0cb4: (-s ours) am 99a2df71: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'edfd0cb4a7636feb039f940bccbd2f8f61a2de53':