tree b3eb3089d690224db85dac2f94e2d5865426c68f
parent be983a2e35450b5402001d3d777815250e04e14f
parent 2116c3cd2fe71dda35b2f7cbc246fa191312f87b
author Daniel Xie <dxie@google.com> 1445566577 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1445566577 +0000

Merge "resolve merge conflicts of 49daa6e6db to mnc-dev." into mnc-dev