| commit | 814d1938f091d311c709bc714c2d31032d43d7bc | [log] [tgz] |
|---|---|---|
| author | Matt Sarett <msarett@google.com> | Thu Aug 27 05:12:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:12:17 2015 +0000 |
| tree | 1c334f11e06ab22e7328a63305f294d5b1ebf6a6 | |
| parent | 929d81ca3f18df55f98bb0455719834736d20083 [diff] | |
| parent | b1df25776b7cce22d2cee2ee5722cfb32d5fbac3 [diff] |
am b1df2577: (-s ours) resolved conflicts for merge of ab10e256 to mnc-dev-plus-aosp * commit 'b1df25776b7cce22d2cee2ee5722cfb32d5fbac3':