commit | 1e52a196531e00972efc3769b03fade9ebe58135 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 00:59:17 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:59:17 2014 +0000 |
tree | 9a0fb31f8ad981859d0ec5a01a15e58a51914811 | |
parent | 0b211b11c2049c51baf6c8746d308179f2e5db96 [diff] | |
parent | 0ca22a895c76d7fde9429e8287415b08d43b78a6 [diff] |
am 0ca22a89: Merge commit \'b5539c14f05bb02527bb06d7cfbb6b5b7ac08e4d\' into HEAD * commit '0ca22a895c76d7fde9429e8287415b08d43b78a6':