45737cb776625f17384540523674761e6313e6d4 - platform/frameworks/av - Git at Google

commit: 45737cb776625f17384540523674761e6313e6d4
[log]
author: Zach Jang <zachjang@google.com>
Thu Apr 21 16:10:50 2016 -0700
committer: The Android Automerger <android-build@android.com>
Thu Apr 21 19:17:47 2016 -0700
tree: 88e7630fe2dc647ff241349d668dcb9271f57751
parent: 2b6f22dc64d456471a1dc6df09d515771d1427c8 [diff]

Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-release

Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d

3 files changed

tree: 88e7630fe2dc647ff241349d668dcb9271f57751