tree 162af618ca0752c4f4123df84ee85673dbeb334f
parent bd6a6e6019231621644e1701b6a95093abc40333
parent 06c0e408c4f06fdb9a5785baebeb293391711e65
author Daniel Sandler <dsandler@android.com> 1375984200 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1375984200 +0000

Merge "OK, now it's a release." into klp-dev