tree 4a594874acc0ce15a9987d6f0d1c10e8e575084c
parent d9a1b35df62eddc56f69281aea1534d187b63205
parent 82bfca4609244f2b8169bd779765791d6638b448
author Brian Carlstrom <bdc@google.com> 1446748736 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1446748736 +0000

Merge "Fixes for sm and pm usage"