commit | a676b14d5133ed87a1a770b25acf63d4a228d7e2 | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 01:58:41 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:58:41 2013 +0000 |
tree | d48d195c320ebd60b898447f1c5dc8cd4509d233 | |
parent | 019d871562e5eaf785b2e49bb0824d96d785916e [diff] | |
parent | 113c8f50a218bdb613284a3fedf91ce71b476c55 [diff] |
am 113c8f50: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit '113c8f50a218bdb613284a3fedf91ce71b476c55':