tree d7ba7bf8a7e275cf164e245b928c7509d4a52728
parent e938682e0ed9bc326b940bba31dc0c8472e81848
parent 158e11d6738a751b754d09df7275add589c31191
author Tao Bao <tbao@google.com> 1432855537 -0700
committer Tao Bao <tbao@google.com> 1432855537 -0700

resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aosp

Change-Id: I164cdc4915b6ca1b623b206c0ccbb12e0fc3fa77