commit | ccc1d7542f194002ba6ca1e166a4309b288c5a99 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 00:59:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:59:34 2014 +0000 |
tree | d9f5c941810a4315fbe61d8bf5460afc2a65b35d | |
parent | 9f83fb9c0da7de7eb377a19a1b13a86d8835ccb2 [diff] | |
parent | 2cfc3a8f9a3d600c1d40161cd532eb45bec92dda [diff] |
am 2cfc3a8f: Merge commit \'a9c4376daac3b9deda0c617b6df393e741885f37\' into HEAD * commit '2cfc3a8f9a3d600c1d40161cd532eb45bec92dda':