diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-10 09:44:59 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-10-10 09:44:59 -0700 |
commit | f97af999b91122116b953d1f06b48c00e18a4531 (patch) | |
tree | 5c3172b9b68cf16afc245fb5e5d8cbfb9587e514 | |
parent | 44ecdf72686fdff76e6f1d76a12f734631f45d2c (diff) | |
parent | 4ba4655ec32f17298d3c6e43640a44dca344b921 (diff) | |
parent | 41ef60e3654fbd86978b0219e52f4997d56689a2 (diff) | |
download | libhardware-f97af999b91122116b953d1f06b48c00e18a4531.tar.gz |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ib081b6a0369bd5a597e53ee3a5551f5a63b67939