tree eecd372c819d1545b6170ecccd863e4c699cdee7
parent 73738c3d24cf7dba450c3e3d6fcb057b3835303f
parent 235a281cbda1f38d70362ef7c15d5da959945973
author Elliott Hughes <enh@google.com> 1347300353 -0700
committer android code review <noreply-gerritcodereview@google.com> 1347300353 -0700

Merge "kernel-head: __NR_perf_event_open has wrong definition for x86"