commit | 04958d154370fde4db2deecfdfded210b694688d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 15:31:38 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 15:31:38 2013 -0700 |
tree | 093c43cbfd9326b0b79988479d3d236d1b34b678 | |
parent | 4348fcdddac18b6833f04f8548573a1e033c05d1 [diff] | |
parent | c45da6d7cee73da07b205b20ee9b8aff8788c7e5 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: Idf48718630a3b4260b530f26d8f8f26b3d2e1e5c