| commit | e725aa75dca868e00b65a9e93b2cb238d56eafd2 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 18:43:43 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 18:43:43 2013 +0000 |
| tree | 0b5652f4fcb7d3528fced5d2c0be48e2dd541470 | |
| parent | a5c8d3783b595d3566c22be5609e1a3a13383920 [diff] | |
| parent | 03b940431876f966f71db70983fca7e836c66a17 [diff] |
am 03b94043: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit '03b940431876f966f71db70983fca7e836c66a17':