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