commit | b89f1ec20b05675a0e70f9bfb6aa4a703e4597f1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 16:39:07 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 16:39:07 2012 -0800 |
tree | f102e47b480849cf5b5140d73473629bfcd68265 | |
parent | f9ae5f75af259437391e41dac7f3c4461c495dd9 [diff] | |
parent | 2cba4f1b56f57d86bd6a58e5eb4ba218764febf9 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I3fbcd93e4cef710bf1562bc7844f4a62f3146e02