Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-dev

author Tim Murray <timmurray@google.com>

Thu, 11 Apr 2013 04:50:31 +0000 (04:50 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 11 Apr 2013 04:50:32 +0000 (04:50 +0000)
author Tim Murray <timmurray@google.com>
Thu, 11 Apr 2013 04:50:31 +0000 (04:50 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 11 Apr 2013 04:50:32 +0000 (04:50 +0000)
diff --cc graphics/java/android/renderscript/Allocation.java
Simple merge
author	Tim Murray <timmurray@google.com>
	Thu, 11 Apr 2013 04:50:31 +0000 (04:50 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 11 Apr 2013 04:50:32 +0000 (04:50 +0000)