tree 53f69cc9ead0975b8e38caec802043873a9814a3
parent a1b09a92d8879f1f385046533628547a118eb558
parent e1dea48f92fd087573ac76c6acd03f5a19181ece
author James Dong <jdong@google.com> 1331667894 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1331667894 -0700

Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base"