commit | 12928a07c5c19ac3dea6d0489506595c138b621a | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Mon Apr 28 19:45:06 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 28 19:45:06 2014 +0000 |
tree | ca619c6fbef9af996f778e2ed63b6335f376e4f4 | |
parent | 685a0a72d445515167a2071330679cdf9b53a62d [diff] | |
parent | 2336c4ecc5735eb374e5c804b1fe863650c24d7f [diff] |
am 2336c4ec: Merge "Fix build." * commit '2336c4ecc5735eb374e5c804b1fe863650c24d7f': Fix build.