summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorJake Hamby <jhamby@google.com>2011-06-07 16:24:15 -0700
committerJake Hamby <jhamby@google.com>2011-06-07 16:24:15 -0700
commitae62b7b0bca9c46dea30ee81a7aada3e7576638b (patch)
tree39c9ecb6b23bbee1a9d5f688444fb235dab7e61f /tools/aidl/generate_java.cpp
parent67f09cd090adae6365ca36546b0a517e51255876 (diff)
parent66040bbb087b04c4bbac8429f91bbff1029e1440 (diff)
resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions