tree c4a1ffa6147bbaad44f0c4fc97f8f4eeb1ec2533
parent 3a8960579c9177141ef672477016e4579146dbce
parent 4abf0885d7411e92ea0345686781e663a00fc1ba
author Vinit Deshpande <vinitd@google.com> 1426452262 -0700
committer Vinit Deshpande <vinitd@google.com> 1426452262 -0700

am "am 71518174: Merge "Fix project settings." into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
4abf088 am 71518174: Merge "Fix project settings." into lmp-mr1-dev