commit | aa0539ee8696b3d373029f6b93581d827def0089 | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Thu Aug 27 10:50:13 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:50:13 2015 +0000 |
tree | ebd4d739215332e242fa5cba88f95c0791873d42 | |
parent | 6b2416cc1b3d09de3f386a49b949459c2157e0d7 [diff] | |
parent | 06f713280f7b8780e936dce562e5584172cfad5c [diff] |
am 06f71328: (-s ours) resolved conflicts for merge of b3e022a6 to mnc-dev-plus-aosp * commit '06f713280f7b8780e936dce562e5584172cfad5c':