commit | 86dc75dcb45880832dc125d2f38dce4ca63a1e78 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:30 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:30 2013 -0700 |
tree | dcc880e948f2a442ec8c0b08406e904c913c98a3 | |
parent | b10d106f6e991177020c318ffb9d0fb0cca3eddc [diff] | |
parent | 27b308beb65aac8d235673f2a6c33ae13d9041b1 [diff] | |
parent | 363cef472e275f4900dc4916acd03718c7d57284 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: Id19e45c1de96766e22fa6e721c864214ba233fd6