tree 19ed9612e6f2a9add93c3c909559f031e34bc027
parent 9c2895fb0e061c2fad5d13e57ba407659cb40d8b
parent 84ae085dc7f37e03d4fe50fc7747f675df32fbb3
author Chris Wren <cwren@android.com> 1392411775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411775 +0000

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

* commit '84ae085dc7f37e03d4fe50fc7747f675df32fbb3':
  better support for multiple files