commit | b9196f463411ec442b4f8b0d32e03b8c6e537748 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:27:02 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:27:02 2012 -0800 |
tree | b173cd4816421af34605cbd70918ae9a66e6cae9 | |
parent | 79a1f577bda98d7fe4c67aac110da226530d6e76 [diff] | |
parent | 95b4c36e6a60bdc7f6fbc745bf24592132b973f5 [diff] |
am 95b4c36e: am 48cc6fce: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '95b4c36e6a60bdc7f6fbc745bf24592132b973f5':