tree 140aef8134776de7949b65694c0ae58d2ea385ff
parent ab59cd2330b788a4e2b2dbcd9701dd2c3a49955f
parent ffaa11072bb571dce043cb2ba2cbf6a84a9b59ac
author Igor Murashkin <iam@google.com> 1458083218 -0700
committer Igor Murashkin <iam@google.com> 1458086051 -0700

Merge branch 'upstream-master' into HEAD

Initial downstream of atinject code (revision 86)
from https://atinject.googlecode.com/svn/trunk/

Bug: 27552463
Change-Id: Ia72763ed396d2f3ac3bc2bc66fb3e383818e1c82