commit | ba70ed9ae7dab75bde317a8dc8886da309831eca | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:20:22 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:20:22 2012 -0800 |
tree | bcadb3d6e2a3a174d18bf5df3d1567280b9155c2 | |
parent | c424456542cacc7d776e1adc859ed1c0e784dee0 [diff] | |
parent | 31da9db0d1bf3227e3c383aa6ac28bde3c6409e5 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I70866c059c12fdba45761ecbbb6e2a4cf2aa8107