tree 3f8093007e155f1f06505b752aad091cc3aa544e
parent 7dbed399cbef000e3131464f9051db6aceffda7e
parent 031af4d5004972331828fdf75e8e1f3fa79d20dd
author Dan Austin <danielaustin@google.com> 1442424839 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1442424839 +0000

Merge "resolved conflicts for b6c719ec to stage-aosp-master" into stage-aosp-master