| commit | d161be2d063565ecab6d1fce4440d496d8928abc | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Thu Jul 24 22:25:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 24 22:25:59 2014 +0000 |
| tree | 3a1565d9508e12fe8499f1c70aaf50da312f3a6a | |
| parent | eb9563f9ab610ca09bf99c6975f70c14c35683bd [diff] | |
| parent | 77d93bceb06dd3983868327b03a726bf5d8ae079 [diff] |
am 77d93bce: Merge "fix build" * commit '77d93bceb06dd3983868327b03a726bf5d8ae079': fix build