tree 50136329ead3f18165ec39b29ec974fe2d633f3a
parent ea893c48145599a83409d25d5bd266a8acfe66e1
parent be4e151c2714338f32b783d828e347f8218f9cdf
author Ben Chan <benchan@chromium.org> 1405112760 -0700
committer Ben Chan <benchan@chromium.org> 1405112766 -0700

Merge branch 'merge-permission_broker-rewrite' into merge-permission_broker

BUG=chromium:392611

Change-Id: I60353cbbb45747cc702e255dabb04c0f100ee42c