tree 6e6a6c03def154c546df73cb82dd3b15adf6e463
parent d7932a62d091df1559a47004670a951d8ab9c7f1
parent 883daf6eed36c11a7cb458f07a88e7a9cea29c27
author Jesse Hall <jessehall@google.com> 1365888061 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365888061 -0700

am 883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev

* commit '883daf6eed36c11a7cb458f07a88e7a9cea29c27':
  Make gen more readable, use UNIX-style line endings