diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-02-11 12:37:12 -0800 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-02-11 12:37:12 -0800 |
| commit | 33d3c53da021f0d044028860ace0f4ad817273f5 (patch) | |
| tree | 1ebd67dbfa35109595bd6258633abba7931f1290 /native/android/looper.cpp | |
| parent | c093955af1434a7023093acb148ab152d915e59c (diff) | |
| parent | 517e0274cb2cfd215b20622280d5e256e8282bbb (diff) | |
| download | frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.zip frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.tar.gz frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.tar.bz2 | |
resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp
Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a
Diffstat (limited to 'native/android/looper.cpp')
0 files changed, 0 insertions, 0 deletions