| commit | 902923e1d4046df5e0270c19bd96cd397b3f4905 | [log] [tgz] |
|---|---|---|
| author | Vinay Kalia <vinaykalia@google.com> | Wed Aug 09 15:43:51 2017 -0700 |
| committer | Vinay Kalia <vinaykalia@google.com> | Thu Aug 10 10:18:01 2017 -0700 |
| tree | 912b8fa78db642cd6b3e88d28843fab37ae1ee37 | |
| parent | bdb35c88262a50cafe8f92c26484a028185190fb [diff] | |
| parent | 613fc2e897349d6ad8ad402339641a561186e943 [diff] |
resolve merge conflicts of 613fc2e89 to stage-aosp-master Merged-In: I75f51146a8c604fed5997f7ad4a77fc89b5b5c44 Merged-In: I8a8492757191c603786f0ca275bacbf63d577459 Test: Verified this conflict resolution. Change-Id: I0142a236327cc277f348d7188da0807983fc5132