| commit | 19fff4218758dc8fc6fb9130bdb90e54039b0836 | [log] [tgz] |
|---|---|---|
| author | Anh Nguyen <anguyen@codeaurora.org> | Mon Mar 09 23:04:59 2015 -0700 |
| committer | Anh Nguyen <anguyen@codeaurora.org> | Mon Mar 09 23:04:59 2015 -0700 |
| tree | ae92c18485a04075e3824b676e811ca3d0b1b3e8 | |
| parent | bdeb67fdee6256391a5ad3cf8dfe65b364e54038 [diff] | |
| parent | 796aaf7fb160fea12bddc8406d7f006ce811eb43 [diff] |
Merge tag 'android-5.1.0_r1' into HEAD Android 5.1.0 release 1 Conflicts: cmds/atrace/atrace.cpp include/media/openmax/OMX_Audio.h services/surfaceflinger/Layer.cpp services/surfaceflinger/Layer.h services/surfaceflinger/SurfaceFlinger.cpp services/surfaceflinger/SurfaceFlinger.h Change-Id: I090bc3c6d46cb853289b449b2e5f234ff950437d