| commit | 274728b4133e39c41db32d4ce34135818aaa048c | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 18:47:18 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 18:47:18 2013 +0000 |
| tree | b55c38eec3512dead03bcc3ce69d87594cfed7bd | |
| parent | 538debd13b7d45e531c98091d9ce494f47e35c9e [diff] | |
| parent | b53a3cc51c3230398ee7098ef240dd60df4bcf1a [diff] |
am b53a3cc5: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit 'b53a3cc51c3230398ee7098ef240dd60df4bcf1a':