tree 3136b393812950303b9a67a4c9743cc9ec1683c6
parent a6fb541857d822939cada24574f566df87dda35d
parent 550bd340c36d33c1bc820a83f92e588421102e2b
author Tao Bao <tbao@google.com> 1430955566 -0700
committer Tao Bao <tbao@google.com> 1430955566 -0700

resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp

Change-Id: Ia447435f1345a0bf9648d1d5593e276191d6a99c