tree b8d00a7ac0a4cc04fa45488c5e8c313caa82a8a0
parent 0090ebf50d523be5fff156e22e11563f07ad0802
parent 451501cc45bb5b71946f5251ce0d754314235789
author Meng Wang <mewan@google.com> 1490137030 -0700
committer Meng Wang <mewan@google.com> 1490137030 -0700

resolve merge conflicts of 451501cc4 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd2f8b336bba0ec3f85b16ed967c23b45a2f32e6