tree d01cf7fbf58fd5b9cf911ef46a708fcc0484cb3b
parent d4d54ede13f6f76c77137c35a87fa5f0436eded2
parent 6a20db030e486326e70968612662938d12d86a7b
author Nagender Telkar <ntelkar@codeaurora.org> 1415913151 -0700
committer Nagender Telkar <ntelkar@codeaurora.org> 1415913151 -0700

Merge remote-tracking branch 'origin/aosp/master' into HEAD

Change-Id: I19a68fe2794acc1a5806dca8b336806d73850e9f