OSDN Git Service

resolved conflicts for merge of 780d57b8 to klp-modular-dev
authorJason Sams <jsams@google.com>
Thu, 13 Mar 2014 07:39:04 +0000 (00:39 -0700)
committerJason Sams <jsams@google.com>
Thu, 13 Mar 2014 07:40:24 +0000 (07:40 +0000)
commit632c915ce8675033bbb7d356239d16594b26dffb
tree76e99d00c2298b04960c32bf932ee23b7ccd45e1
parent280db65032fe0ed6897bc33c627ae176daecb1c2
parent780d57b81ac1a9af6ae533f5039cd91a662b49f4
resolved conflicts for merge of 780d57b8 to klp-modular-dev

Change-Id: Idf2f939c25c342fff98da6b83be875d7708deba0
graphics/java/android/renderscript/BaseObj.java