commit | 26f47916320ab3f0902d5fe804b87ffd4608db21 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:30:44 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:30:44 2012 -0700 |
tree | 99a6a4b0c73bee8167682fd7c01ce4dca1bfbfc1 | |
parent | 582fe4bb5d6479aaf46ad271e6f25561166bb6e6 [diff] | |
parent | 53e91f848917afd91829c1be45f308e5b0d6c265 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I7a169065f1ec4e36acacdb02c37b51c7036a27bf