| commit | 42eda4eec8cc111ff898de2bde873cbe89c3b8e5 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 18:47:19 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 18:47:19 2013 +0000 |
| tree | 4d59ea65d90c48ca369955045dca5f722f7629f5 | |
| parent | 4f01a348837f10dfed2eb58d7f0f9ce62ba990a3 [diff] | |
| parent | f01f14c06fc737a9351c4b11367ff3f58fb6a40f [diff] |
am 2ec96fe1: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit '2ec96fe16188764a1a4f5ae65fe24e34409d6458':