| commit | c7d67e1f05433936150e4fefa436fece314dce73 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 18:47:17 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 18:47:17 2013 +0000 |
| tree | 52abae048eae182e8a94722401f8522f47043ab0 | |
| parent | f260bf12886a07de76e2d0d4dc5e7745db261fb3 [diff] | |
| parent | 79e6e4661c327607f81908906509bfb8b948398f [diff] |
am 79e6e466: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit '79e6e4661c327607f81908906509bfb8b948398f':