tree 78a17dd945ae0892f2dc5d3741aa76d651821712
parent e3a07da04db34befb689ee78a37d91703597679d
parent 2d7d363fa1a13958e25002be213196d53e9f87dc
author quddusc <quddusc@google.com> 1383586715 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383586716 +0000

Merge "Merge commit '177a5df9' into manualmerge2" into klp-dev-plus-aosp