| commit | c5bd8c29d6b65ae8f602b63298c0831044e0dc03 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Jul 31 09:58:03 2015 -0700 |
| committer | Tao Bao <tbao@google.com> | Fri Jul 31 09:58:03 2015 -0700 |
| tree | 040e867cf9126c3f6ae7130702458835fccf5caf | |
| parent | 8e25a77e083895a08cf8227f3c66bd52f96608b8 [diff] | |
| parent | bbb41a7097c44a6dbfe1a7ee369037b4f11c745b [diff] |
resolved conflicts for merge of bbb41a70 to mnc-dev-plus-aosp Change-Id: I250c007de89a52f8911cf56d7dfded38962284ac