tree 09e384c8f7d99ac33ab33251df61eb4c260fdfaf
parent 0fe13b1f7001f5e2f23062a97140784258f3423e
parent 152d353e875d1d00d7e64d3b881fca74c4500e67
author Rom Lemarchand <romlem@android.com> 1447732130 -0800
committer Rom Lemarchand <romlem@google.com> 1447732130 -0800

resolve merge conflicts of 152d353e87 to master.

Change-Id: Ida54b932d0a077d6eaeb2418a6cbf58f96035fff