commit | 677d4ae6eae38a110ed7d73cf6982c042d80c499 | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Fri Jun 13 21:48:07 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 13 21:09:46 2014 +0000 |
tree | 72bb34eaf3ce0d997324e705101c6a5c0e0fb4b3 | |
parent | 0cb41fd5ad37a1a9aaedb737491fa71310ef2ddc [diff] | |
parent | 220cad6d9743f134c0d44623fc56cd57467866e7 [diff] |
Merge "Merge commit '0f3d3dd2'"