| commit | 51ff3d6ecad8ef8f0693eb6b3fa8a1de5ea8ee7b | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Dec 05 02:43:18 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 05 02:43:18 2013 +0000 |
| tree | 062491ce2eaeeb4f8524609db935c3a21782c163 | |
| parent | d114d220401ea6621d4688c04f6e3c681d5abec1 [diff] | |
| parent | c1bb0c774afdfcea6fbed52a85abbffe15ef49b3 [diff] |
Merge "resolved conflicts for merge of 9c7281fb to master"