| commit | f268ff781e44bfdc413bed0fc59fcdd8278349ea | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Apr 14 13:56:17 2016 -0700 |
| committer | Xin Li <delphij@google.com> | Thu Apr 14 13:56:17 2016 -0700 |
| tree | 8b5b502e844e80b0d049d93f76af5eff258bb48f | |
| parent | f7063c1e913edebd3402a2c2467c1bdb3d4b79a9 [diff] | |
| parent | ff6015735bf3104452860e35e6bd503fbb0d51f0 [diff] |
Merge in history after reset to stage-aosp-mnc-mr1-release@f7063c1e913edebd3402a2c2467c1bdb3d4b79a9