commit | 81b840ea5a57469f0613b7ed6987160c3472a37d | [log] [tgz] |
---|---|---|
author | Jeremy Joslin <jjoslin@google.com> | Mon Dec 19 22:26:16 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Dec 19 22:26:16 2016 +0000 |
tree | d9c6498d314e92476d84c30406961787b4a69621 | |
parent | ccec35c456f12a9438a524793159f5b2bda69443 [diff] | |
parent | 72624e07200a6d5359573689d62f0a2f0da1c02a [diff] |
Merge "Fix ScanResult array parceling." am: 5fdc86fb27 am: 68764eabb7 am: 5b1a460b94 am: 72624e0720 -s ours Change-Id: I2ae8a19d0a0bc4deafbecfeadbc12803d1b2ff54