tree b1a5a38500a862d6acabe2ad8301c9b017c50752
parent 79467dd97225f8ad06fca29d595f3afd1f08ae53
parent 71574c84bd86741cf7b7b70abdf9226525f3f62a
author Amit Mahajan <amitmahajan@google.com> 1468270454 +0000
committer android-build-merger <android-build-merger@google.com> 1468270454 +0000

Merge \\"Support self-explanatory icon for PLAY TONE command\\" am: de3074a5ed
am: 71574c84bd

Change-Id: I9b12f5852d245ffe23f150e0c19a3667cf5fd9b3