| commit | 171336be126743cf9042971fd076b955ad596ffa | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:37:27 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:37:27 2012 -0700 |
| tree | 1e22df7457e7b84b7e85bdb3ffcca3b892eafe76 | |
| parent | a8b916093772627f55fa1bfb624fdebf38af171b [diff] | |
| parent | c24eac15619b9644a80bd6d8ea87820763f20e2c [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: If24ab92e844fb1a6e6cdec7bb9cdfba887df812a