tree 2a4cab2322172de2f2503c5255c9882013439fb9
parent 43f0640fbf476404139eb8a196465000933da4ef
parent c91437d38ae14a20046de47831eb0f9bfd329af7
author satok <satok@google.com> 1299196063 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299196063 -0800

am c91437d3: do not merge: Cherry pick change I878192090 from master.

* commit 'c91437d38ae14a20046de47831eb0f9bfd329af7':
  do not merge: Cherry pick change I878192090 from master.