peek

Change-Id: I42b0548335377bf5c2ae48af413f913ae5db22ba
Merge branch 'cm-11.0' of https://github.com/Triangles/android_frameworks_base into cm-11.0