| commit | b2312cd033ecc4821d82d8c994b91ea526a11aaf | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 18:47:18 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 18:47:18 2013 +0000 |
| tree | c662b01aaa13ce56ef59ee5f1cb87ec4fbeb4afd | |
| parent | 8ebc534467000ebd73faf17fc106da0c5ef194ca [diff] | |
| parent | bd4c319790b5ac7be6694afd6ec9f9303acb0638 [diff] |
am bd4c3197: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit 'bd4c319790b5ac7be6694afd6ec9f9303acb0638':