tree d74fe49905c1c064b794c456494ad7cf78e94bce
parent dec26e796a9917adcdda77deda811b0545e37a26
parent 17f0ca51e84eb8d9f70a64e97de1151739a04406
author Chris Banes <chrisbanes@google.com> 1450084525 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1450084525 +0000

Merge "Tidy up support-v4 shim APIs pt. 2" into mnc-ub-dev