tree 13997d40d7f72b9e0fe51c52f2a58e35b9be8f06
parent 8ecce002390172310a3e9d7ab3e92f647c23b1fb
parent 87eb4007e16f67d156f646982764d5edaa16e0cb
author Ian Pedowitz <ijpedowitz@google.com> 1439332879 -0700
committer Ian Pedowitz <ijpedowitz@google.com> 1439332879 -0700

resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp

Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa