| commit | e114a24a02b96bd2351f0f7d3428dddea3fde08f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:02 2014 +0000 |
| tree | 690d1d740122665b78b2c9efb36c0ea63dedf304 | |
| parent | b49a1a93195d71c24c21bdad8ed6900dc76a7f0a [diff] | |
| parent | 1e52a196531e00972efc3769b03fade9ebe58135 [diff] |
am 1e52a196: am 0ca22a89: Merge commit \'b5539c14f05bb02527bb06d7cfbb6b5b7ac08e4d\' into HEAD * commit '1e52a196531e00972efc3769b03fade9ebe58135':