commit | af14b354bc958d08df4df78d5bb00a8aaad82f2c | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Thu May 22 01:06:07 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 22 01:06:07 2014 +0000 |
tree | 6e27c86360bb87ef7a30e060a2d40dfc0e05c396 | |
parent | 982680a4f93bb2b7ad4dce0f1ab19ee7b4ddf22b [diff] | |
parent | 84551e767e7beae692f513fba5ce13c1c8155fc9 [diff] |
am 84551e76: am 2dce8b3c: am 5d8b7b22: Merge "Fix build." * commit '84551e767e7beae692f513fba5ce13c1c8155fc9': Fix build.