tree 8941dd8cb87c410323b1d359c52cc66149b396fc
parent dce3ccc533270340f57223a7c2685947762cfcbb
parent 236b66bed42f4b09298237362ec1fcae595fbc77
author Nagesh Susarla <nageshs@google.com> 1415739291 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415739292 +0000

Merge "Minor cleanup to fix a few things in the media sample" into lmp-dev