tree bbf05dcb3ccc34415263328b171c039ec8d85e64
parent 18769204be413cf6e857be48e73bf4bf539de806
author Robert Ly <robertly@google.com> 1397578101 -0700
committer Robert Ly <robertly@google.com> 1397578459 -0700

resolved conflicts for merge of 99c3605c to master

Change-Id: I9da7fcad19c3fe85fddb61c5c58b1482417d461a