diff options
| author | Chris Craik <ccraik@google.com> | 2016-11-16 10:33:54 -0800 |
|---|---|---|
| committer | mh0rst <mhorst@tzi.de> | 2017-01-13 10:07:08 +0100 |
| commit | 06ecaa36d050866b2f0f29864b3e69b9970e9980 (patch) | |
| tree | aca9d7d0418cb61aa97218f73224c7e03349adcb /common | |
| parent | 4bfd4bae257bef1693e3585b5e0f3f9d397372aa (diff) | |
| download | android_frameworks_ex-06ecaa36d050866b2f0f29864b3e69b9970e9980.tar.gz android_frameworks_ex-06ecaa36d050866b2f0f29864b3e69b9970e9980.tar.bz2 android_frameworks_ex-06ecaa36d050866b2f0f29864b3e69b9970e9980.zip | |
resolve merge conflicts of 3802db4 to mnc-dev
bug:32338390
Change-Id: I304c0c8c646808e690918eae7d34f0852e2b0fa8
(cherry picked from commit fffaa9f25edddc6fa10512c1cc19f625c2abee8c)
(cherry picked from commit 7f0e3dab5a892228d8dead7f0221cc9ae82474f7)
Diffstat (limited to 'common')
0 files changed, 0 insertions, 0 deletions