summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-28 11:06:34 -0700
committerConley Owens <cco3@android.com>2011-04-28 11:06:34 -0700
commita60594cb1c1399f557a82403f7fc7abb7af55250 (patch)
tree942da1e399eb46694c8bb0fd13092bd16a4a5058 /tools/aidl/generate_java.cpp
parentb2149f4a11cddba303674298ef543e76ea11475e (diff)
Fixed bad merge in ViewRoot.java.
Change-Id: If76a320da3ecf0d0e9f366eb7157b195274a9e5f
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions