| commit | b24c371c194bb2fbc62dfb0baec29740ebb06c23 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Oct 31 16:33:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 16:33:41 2014 +0000 |
| tree | d49706a216486b331669ad0acdb48ba098e60a48 | |
| parent | cbf60c0a082fd75e97561f7e824e2ab75b60e046 [diff] | |
| parent | b6fcc55995e843d5cbe0add4ccd013fd77db9196 [diff] |
am b6fcc559: am c1e586dc: Merge "Follow-up to -no-integrated-as change" * commit 'b6fcc55995e843d5cbe0add4ccd013fd77db9196': Follow-up to -no-integrated-as change