| commit | caa99d67db399278fceee1deee54a18fa7756989 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:34:31 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:34:31 2012 -0700 |
| tree | d859052f6839fedf654ce8cea7dea2d567ad710f | |
| parent | 68cdf704ba1fa342eda8b76de58f8107bff78ba3 [diff] | |
| parent | fcbb8af593db05b2041c69ea9db8bcb6b9b899d5 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I9a3c5b3e910cd2ba0b1be72e8f87ff2aba8894c4