tree d277be00376a3c6f39c844a3b505eafa39e6fe1e
parent e52eb1f706c5f9e6424081395f089f0e30a2ee44
parent 80790d78f64a3dbf907773e1302e8a8ca65d3766
author Jean Chalard <jchalard@google.com> 1366804252 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366804252 -0700

am 80790d78: Merge "[PB3] Simplify storage"

* commit '80790d78f64a3dbf907773e1302e8a8ca65d3766':
  [PB3] Simplify storage