| commit | 722f91cee7b4e39c327d39a49c272833dd2ea6b4 | [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 | 55f9c3d43824090cf34a5bf2b1d37ea561b68286 | |
| parent | 24a325d6f8c4bbf9330e6ce0c769d46e04266ffc [diff] | |
| parent | e2976465ef00aa6aeee94fc845a487c95b47a304 [diff] |
am e2976465: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit 'e2976465ef00aa6aeee94fc845a487c95b47a304':