tree 98e9478862cb98f10622940bc12e1fa5146bf23e
parent f4ff2b119c1e5980cf002bfb260915b1366d879a
parent 05fae7e0be51ab3bc54cd62e1db9160d31bb89ea
author Dan Willemsen <dwillemsen@google.com> 1439869848 -0700
committer Dan Willemsen <dwillemsen@google.com> 1439869848 -0700

resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp

Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3