| commit | 9f04f41dbcf9aad1c698e1354e9c98ccf309f02f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 00:52:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:52:54 2014 +0000 |
| tree | 5625a145d9d754404a3f38661f3d057c33f012e4 | |
| parent | 8264e427b2f282f01b3e41be12141a76de5dad62 [diff] | |
| parent | 2c964c0e3068496028746e22d42470fc5a275926 [diff] |
am 2c964c0e: am 837e2894: Merge commit \'0bce518ab9e569504bdeefeb3e5e2d86d3382d2b\' into HEAD * commit '2c964c0e3068496028746e22d42470fc5a275926':