tree 897cd04a91e3aaf0cc9c5be2b70d2bd2456e9afc
parent 62e0ee324bb17540d37dd4f2e8f01b601e4e4da6
parent d7c3c523d920dc97a2c4fc3c9430a373f494fe21
author Satoshi Kataoka <satok@google.com> 1365648059 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365648059 -0700

am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"

* commit 'd7c3c523d920dc97a2c4fc3c9430a373f494fe21':