commit | f99585bddd07da98a018e70e29bad55e2204e6ea | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Oct 31 21:29:06 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 31 21:29:06 2013 -0700 |
tree | f113e569a9c651e93d9d4db62f6a9e990e11442f | |
parent | 213a31d7398da7328a6a8577b504131c6e880235 [diff] | |
parent | ff11bce0978d56ce571454d16084028df4106e13 [diff] |
am ff11bce0: am 07bdc2b8: Merge "Fix build." * commit 'ff11bce0978d56ce571454d16084028df4106e13': Fix build.