commit | 713fb9fd596c9c0e3c2021f7b1f69bec12a1e93d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:34:30 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:34:30 2012 -0800 |
tree | e397171fc964d4c7ac0ca85d854e50ccb9b8408e | |
parent | 752044261f170477bfcc5d0684526c4061299fa3 [diff] | |
parent | 0d3751ca395bcb6a9546dd9a124582b52097ef90 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I4520610c65057a87aaaf270c1cd84fffaf91d7e5