tree ed9c94c4a7cb72745c1d872ea21a0ea3cf5f880d
parent a491e11989424115d627b58cf66e0c4a1f9ede33
parent 1029d18fc055b6831c46f365215552bda8b793db
author Andy Hung <hunga@google.com> 1480727732 +0000
committer android-build-merger <android-build-merger@google.com> 1480727732 +0000

Merge "Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91 am: 98c2151dc3 am: 110d4d31b3 am: 71840c6a36 am: ec982d4628 am: 21556821c9 am: be0097ba0f am: f462a8c127 am: f574a9722f am: 15d9e5097e am: 5ed0c9ffda am: 342652c245 am: 83cb428361" into nyc-mr2-dev-plus-aosp
am: 1029d18fc0

Change-Id: I5ff587695d1047c51acc66ea210d38fecb20716e