| commit | bc168b5475b4484a4880d439d2e04201e24a6e46 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:16:33 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:16:33 2012 -0700 |
| tree | ede7b68059e3fce4c4e8d10195c32840eb0d0187 | |
| parent | ec12d75df6464637ee0d8a004745080f21a57d74 [diff] | |
| parent | 4490d0ee4ad3740fdda2426927a047a4843d02f1 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I7cd153e8ccfb7d572a5796ca353ec9777de789d6