tree 19ed9612e6f2a9add93c3c909559f031e34bc027
parent de0fc51acf071b42a5a337291af9467307917651
parent 1cf23e10c67539447c5f687b73f5d15bd7f7e351
author Chris Wren <cwren@android.com> 1392411293 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411293 +0000

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

* commit '1cf23e10c67539447c5f687b73f5d15bd7f7e351':
  better support for multiple files