tree ee6af082761f245d1f081e38629c5d30dde7e1d6
parent e5520ea84671e907799217315ee3b47130d6e2ce
parent 7ae6a22c025e3e4588faefe73824bf75e10c3e02
author Jean-Baptiste Queru <jbq@google.com> 1336096082 -0700
committer android code review <noreply-gerritcodereview@google.com> 1336096083 -0700

Merge "provent nativeImOpenDecoder from being removed by proguard"