tree 7d79ea18bccbb6c349cb95cdc7537965ef4d9adb
parent 0cb0dd964bb8ab6f39b4dcbc0321afe3eba5e3b8
parent 99397b27b4e7c7b100b88c82adbc3687f59f4080
author Walter Jang <wjang@google.com> 1467400617 -0700
committer Walter Jang <wjang@google.com> 1467400617 -0700

resolve merge conflicts of 99397b2 to master

Change-Id: Iec86337f1fc84c8c7102428211adf58bb77edee4