am 76afc004: Integrate sdk.atree changes from master. DO NOT MERGE
Merge commit '76afc004df452384cfd00137a59c7a3e0502ff75' into gingerbread-plus-aosp * commit '76afc004df452384cfd00137a59c7a3e0502ff75': Integrate sdk.atree changes from master. DO NOT MERGE
This commit is contained in: