tree 6ccf61057915d90db2012e82fd067a2bf56a2723
parent dfed244876d6c0ddd8d8bd2b8f3b970cd0a1ab95
parent eb8c3f93edc826413ff4143284dec01c1061d5cc
author Adam Lesinski <adamlesinski@google.com> 1379717952 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379717952 +0000

Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev