tree d916be566863fc03a63cd049093af05759032b9b
parent 4a368585a5f8ae44146c222f6e4b6050e583939e
parent 610520ad206fcb886c6c09f763f434caac8531ff
author Tao Bao <tbao@google.com> 1438883877 -0700
committer Tao Bao <tbao@google.com> 1438883877 -0700

resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp

Change-Id: I55ad47c70091d4f42f83783e9876846f19e2a777