commit | fbc9ea8046cad34b58ad727ce6045e3e15069502 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:28:44 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:28:44 2012 -0700 |
tree | aee8594b43800f6d56f8b5f78062fced5af5b5a7 | |
parent | 4effdb7fd0a9bd84bea9191844a83b2b0b362823 [diff] | |
parent | 2bb0b01cbad57ca1d52272b469435eb7494fd0e5 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I1ad6aff00b1ec87e7db7001b6f5d271fd122723c