| commit | 1720f5221ddb27e3e2555d66543954376535944e | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 02:34:04 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 02:34:04 2013 +0000 |
| tree | b45ad4962e09b95930295071f01feb420a8cfde2 | |
| parent | ee2219842133223008750787a28aed20ff4430c1 [diff] | |
| parent | de8905e4954c86e8e55775b156ea7929f8fd1030 [diff] |
am de8905e4: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit 'de8905e4954c86e8e55775b156ea7929f8fd1030':