| commit | 3395c88f4491f9e9ca2a7ca36a8a999b78f0f9e7 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Dec 05 20:29:34 2014 -0800 |
| committer | Qiwen Zhao <zhao@google.com> | Fri Dec 05 20:29:34 2014 -0800 |
| tree | 1375c1995f453964ca3f020f81a1235b8324a7dc | |
| parent | 69b8c4f9314e6c48dde64a234b2f4b25500abb36 [diff] | |
| parent | aaf823d23c9d3fa1d6b1fd513d07f6fd14f6ea2c [diff] |
Merge commit 'aaf823d2' into lmp-mr1-dev-plus-aosp