tree 21b2b834c6cc03f142050c3a4df94c439cab22fe
parent 3eab917a2527bfbd6160e3282c5491a49bec6839
parent 64b0e4432945039f0226918e2152854cc9db751b
author Chih-hung Hsieh <chh@google.com> 1467063408 +0000
committer android-build-merger <android-build-merger@google.com> 1467063408 +0000

resolve merge conflicts of 079d417 to stage-aosp-master
am: 64b0e44329

Change-Id: Ia3b91ebb942b4ab413ef4c76a06880c62e8581f9