| commit | ade42628a350e8a163793ee9431e715d96dbf8ad | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon May 12 23:30:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 12 23:30:22 2014 +0000 |
| tree | db34eca2da5ec1662b262862fc44c323209fcb14 | |
| parent | ad238b9e08c313f12994a54d0b89ba61335fa1c9 [diff] | |
| parent | 23bf7212ce4ee925569eba7a0c9e4197981f9a29 [diff] |
am 23bf7212: am 51f0d3f5: resolved conflicts for merge of 70555a16 to master * commit '23bf7212ce4ee925569eba7a0c9e4197981f9a29':