am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"

* commit 'd1439291d0a2d6558903205676d41410c319587e':
  Revert "Merge commit 'e887563a' into fix-merge-conclict"
This commit is contained in:
Wink Saville 2014-08-21 17:30:41 +00:00 committed by Android Git Automerger
commit 0554e65973

Diff Content Not Available