tree ebf8a6f5d32ccbcf5f9550a3ee38922005be5259
parent 99008f317d1c4b3462170594fb25ed443544e54d
parent 14af23d14098dd7f91364468afe205ef15433170
author Prashant Malani <pmalani@google.com> 1452718345 -0800
committer Prashant Malani <pmalani@google.com> 1452718345 -0800

resolve merge conflicts of 14af23d140 to master.

Change-Id: I1eee295f592bad672ad093dfbd9c0c2b555df0ed