| commit | ccd830adad7c1723331b6f3d2122b910088dd377 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sat Mar 15 21:05:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 15 21:05:51 2014 +0000 |
| tree | 39203598c6692aa80412d37e48276f610583a838 | |
| parent | 22377569bbac6621a47a478856799588c5f5a3b6 [diff] | |
| parent | 1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8 [diff] |
am 1ba8eb6b: am 8e012107: Merge "Fix the build" * commit '1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8': Fix the build