commit | 1bf0dc2897ce53786948a028fc5f8cbe9c364a35 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Wed May 13 15:29:31 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 13 15:29:31 2015 +0000 |
tree | cf8016c36b9fbc48f6d3fd95d94cc7a2a5f86a89 | |
parent | 69ca573c4938e24d8d035cb6508fa59bd02674a8 [diff] | |
parent | d62d81d32655c4ba9d912cb8ba38b250b544e25b [diff] |
am d62d81d3: am 44de9bad: (-s ours) Merge "Remove rescoping." * commit 'd62d81d32655c4ba9d912cb8ba38b250b544e25b': Remove rescoping.