tree cba62d0d64153aa2169651696bc238591341d679
parent 7eb5984112b9f082cf7d54ea847c2f7eb11812f5
parent 84ae085dc7f37e03d4fe50fc7747f675df32fbb3
author Chris Wren <cwren@android.com> 1414085567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085567 +0000

am 84ae085d: am 1cf23e10: am 8661761c: better support for multiple files

* commit '84ae085dc7f37e03d4fe50fc7747f675df32fbb3':