| commit | 0ad4f2cedde037c2b09a7f09c5f95f0984267c64 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:44:24 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:44:24 2014 -0700 |
| tree | 64ff61592be9775746522821ad4b6f30ea15aaed | |
| parent | 5dae7fda38850a5146a6b8a4edbfd9aa96aea484 [diff] | |
| parent | 7377c7be6abcb3bccabb6cdf2af0ecfed355606c [diff] |
resolved conflicts for merge of 7377c7be to jb-mr1-dev Change-Id: I26d2e3478536826608413094e17cd36da43b4e23