| commit | e22458880544d88af446270e1d434f056bfe1cf8 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 00:59:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:59:06 2014 +0000 |
| tree | 07f8dfb39e7942db2f9654a02cb85e84ad7245dc | |
| parent | 69780cd47476ddc3d100a36c37a3faa169d99a94 [diff] | |
| parent | 3f4dc8e00f57579f5b57726929f1d34260a77cd1 [diff] |
am 3f4dc8e0: Merge commit \'b8bd4924c6de7333a08294a7d20d065e7b7a6f31\' into HEAD * commit '3f4dc8e00f57579f5b57726929f1d34260a77cd1':