tree d593cb34b8e2adbe2c14ae99554c7d5824f3cbed
parent d53f48758f2d295c69bd712bdfcc7006f7148969
parent e5e49cbbac0886baef9e880083fe5cd9ce1519c2
author Chiao Cheng <chiaocheng@google.com> 1399994442 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399994442 +0000

am e5e49cbb: am e2962681: Merge "Overhaul of intellij-gen script."

* commit 'e5e49cbbac0886baef9e880083fe5cd9ce1519c2':