tree cac840606136abd9254ebfc3cdc7126b62a0735a
parent 3373fcafd2cf2ff42699eb40763d784479cafce2
parent fa9980170b961d18e5da16e7d03818e1b8bc7579
author Keun young Park <keunyoung@google.com> 1339612523 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339612523 -0700

Merge "fix wekelock issue" into jb-dev