tree d1393c44a4452f07e38db004cca708d39f0e3101
parent 83d280910c2fada7dc86567301766b2eb29e00de
parent 6c185f5ddbcef3509cfd5a7a44d53ba1119c7c61
author Chong Zhang <chz@google.com> 1472696745 +0000
committer android-build-merger <android-build-merger@google.com> 1472696745 +0000

Merge "Fix MediaMetadataRetriever seek option OPTION_CLOSEST" into nyc-mr1-dev am: 2f9fc81fbc am: 27884dd943
am: 6c185f5ddb

Change-Id: I53ff8557919ad1cabbded926c6eac7b2d602dba4