DESCRIPTION

Merge branch 'master' into stable-4.2

Change-Id: I3da473f9ceed98e0192c8ca95a779c736f97f1aa
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2015-12-15 00:32:45.000000000

Uploaded patch set 1.

-------------------------------------
author: Douglas Trujillo
date: 2015-12-15 00:33:11.000000000

Patch Set 1: Code-Review+2 Verified+1

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-12-15 00:33:13.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

-------------------------------------
