commit | 6e1457c742294d9886b8b650b0e9db494a3d7139 | [log] [tgz] |
---|---|---|
author | Stephen Li <stephenli@google.com> | Wed Jan 20 17:05:09 2016 -0800 |
committer | Stephen Li <stephenli@google.com> | Wed Jan 20 17:05:09 2016 -0800 |
tree | deddd0a2d7e7505a41975ce03d9653e1a28064b9 | |
parent | f2f629cd52b8dc669f776e46e7c5ff889de841d4 [diff] | |
parent | f8f62986b44379855ef4020ebfd5a3e7fc8fbfb4 [diff] |
Merge -s ours commit 'f8f62986b4' into mnc-dr2-dev-plus-aosp