tree 116603ae102b43c3263771810c0f85ce2b60f65c
parent bcd6c620dceb8c07ab7e35d934fd8c374722ab13
parent 43dfcaee37680af9ea968199d3e149d9dc1e3655
author Conley Owens <cco3@android.com> 1384307586 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384307586 +0000

Merge "Update proprietary blobs for manta" into klp-dev