| commit | ba1cf7b3f0a7203cb15d38d05fb6ea40e431e96d | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu May 15 09:33:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 15 09:33:25 2014 +0000 |
| tree | 68ce8839f829324c4defbc49e31d441fc3f8e813 | |
| parent | 7a37b508a4682e7e6c93997c0d4e442ccf28435a [diff] | |
| parent | 4c6491ff7b37d984622c2380300f2c244b26e7d7 [diff] |
am 4c6491ff: Merge "Fix build" * commit '4c6491ff7b37d984622c2380300f2c244b26e7d7': Fix build