commit | f698bdef20e57e78f9e16be2cfa96450766f7033 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Mon May 02 18:40:55 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 02 18:40:56 2016 +0000 |
tree | 7a54fce280b4dd4c504dab63e72e63a78968dc5c | |
parent | e6eff1af18bf6410a1afa062f3503f00c88d1cbc [diff] | |
parent | fa1af45c5909abc151fad91a69db7fda2a696038 [diff] |
Merge "Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev am: 9e23567ed0 am: 20be7bf5ba" into nyc-mr1-dev-plus-aosp