| commit | a58e5ed1b5ad93098f4baf489b276578b3b741b4 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 01:58:26 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:58:26 2013 +0000 |
| tree | 6f6b8611bbb7fe243a4c965738a41eeb350fa2e3 | |
| parent | 9073694c47aec26bcbd026e88919fbebf4a048b7 [diff] | |
| parent | 47b5d67af86b1dcf73171e2ce69119f981e9649d [diff] |
am 47b5d67a: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit '47b5d67af86b1dcf73171e2ce69119f981e9649d':