| commit | 46f19772ae5659c1659a0ac8f1f72389e94a85d4 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Apr 09 22:27:50 2013 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Apr 09 22:27:50 2013 -0700 |
| tree | 68b1a09d332052fa7cf95afbf1768778392bdb2f | |
| parent | 13c9a949b5d74f36edbdbfda764fe554cdbaefa9 [diff] | |
| parent | c76e8a20e255c72e210d3a276acc69f7e9b7e3fd [diff] |
resolved conflicts for merge of c76e8a20 to jb-mr2-dev-plus-aosp Change-Id: I895a8ad8c936a80c70aaac739c6441d3c7c55834